From 9f03a9746fbd8cdce71c2a5536536d8922a8f7ca Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Fri, 25 May 2007 06:51:12 +0000
Subject: [PATCH] Revert revisions 8758 and 8759.

svn path=/dists/trunk/linux-2.6/; revision=8763
---
 debian/rules.real | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/rules.real b/debian/rules.real
index f052ff92e..8c73d3fce 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -45,16 +45,14 @@ endif
 ifdef KPKG_SUBARCH
   kpkg_image += --subarch '$(KPKG_SUBARCH)'
 endif
+setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
 
 ifdef DEBIAN_KERNEL_JOBS
   setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
   JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
 endif
 
-unexport ABINAME ARCH SUBARCH FLAVOUR VERSION LOCALVERSION MAKEFLAGS
-setup_env := env DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER="$(UPLOADER)" DISTRIBUTION_VERSION="$(SOURCEVERSION)"
- 
-MAKE := $(setup_env) ${MAKE}
+setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
 
 #
 # Targets
@@ -136,7 +134,7 @@ else
 	echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
 	echo 'endif' >> '$(DIR)/.kernelvariables'
 endif
-	$(MAKE) -C '$(DIR)' reportoldconfig
+	cd '$(DIR)'; $(setup_env) make reportoldconfig
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
 	mkdir -p '$(DIR)/debian'
@@ -148,7 +146,7 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
-	$(MAKE) -C '$(DIR)' prepare $(JOBS_ARG)
+	cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
 	touch '$@'
 
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -162,7 +160,7 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
-	$(MAKE) -C '$(DIR)' $(JOBS_ARG)
+	cd '$(DIR)'; $(setup_env) make $(JOBS_ARG)
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
 	touch '$@'
 
@@ -171,7 +169,7 @@ $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
 $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	$(MAKE) -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
+	$(setup_env) make -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
 	touch '$@'
 
 $(STAMPS_DIR)/build-libc-dev: SOURCE_DIR = $(BUILD_DIR)/source
@@ -341,8 +339,8 @@ install-libc-dev_$(ARCH): $(STAMPS_DIR)/build-libc-dev
 	dh_testdir
 	dh_testroot
 	dh_clean -d -k
-	$(MAKE) -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
-	$(MAKE) -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(DIR)'
+	make -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
+	make -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(DIR)'
 	# XXX: Needs to be removed from libc6-dev
 	rm -rf '$(DIR)'/include/scsi
 	$(MAKE) -f debian/rules.real install-base
@@ -399,7 +397,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain:
 	  install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_image \
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
 ifeq ($(MODULES),True)
-	$(MAKE) -C $(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
+	cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
 	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
 	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
@@ -423,10 +421,10 @@ install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 ifeq ($(KERNEL_ARCH),ppc)
 	# TODO: GNA
-	$(MAKE) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
+	$(setup_env) make -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
 	  INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 else
-	$(MAKE) -C '$(DIR)' mkvmlinuz_support_install \
+	$(setup_env) make -C '$(DIR)' mkvmlinuz_support_install \
 	  INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 endif
 
@@ -489,7 +487,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
 	DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot' 'var/lib/$(PACKAGE_NAME)'
 	DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
 	cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-	$(MAKE) -C $(DIR) modules_install INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
+	cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
 	cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
 	rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}