Author: waldi
Date: Thu Jan 5 18:12:08 2006
New Revision: 5291
Modified:
people/waldi/linux-nonfree-2.6/debian/rules.real
Log:
linux-nonfree-2.6/debian/rules.real: Support subarch.
Modified: people/waldi/linux-nonfree-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-nonfree-2.6/debian/rules.real (original)
+++ people/waldi/linux-nonfree-2.6/debian/rules.real Thu Jan 5 18:12:08 2006
@@ -3,11 +3,13 @@
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
DEB_BUILD_ARCH := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
-ifneq ($(SUBARCH),none)
- KPGK_SUBARCH := $(SUBARCH)-
+ifeq ($(SUBARCH),none)
+ LOCALVERSION := -$(FLAVOUR)
+else
+ LOCALVERSION := -$(SUBARCH)-$(FLAVOUR)
endif
-HEADERS_DIR =
/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
+HEADERS_DIR =
/usr/src/linux-headers-$(UPSTREAM_VERSION)$(KPKG_ABINAME)$(LOCALVERSION)
include debian/rules.defs
@@ -75,7 +77,7 @@
dh_testdir
dh_testroot
dh_installdirs $(DH_OPTIONS)
- cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install
DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
MODLIB=$(DEST_DIR) INSTALL_MOD_DIR=nonfree
+ cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install
DIR=$(HEADERS_DIR) MODLIB=$(DEST_DIR) INSTALL_MOD_DIR=nonfree
dh_installdocs $(DH_OPTIONS)
dh_installchangelogs $(DH_OPTIONS)
$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
