From b430e6cb77acaeacd2c2b0c37cb988f4ba609cca Mon Sep 17 00:00:00 2001
From: Jurij Smakov <jurij@wooyd.org>
Date: Sun, 29 May 2005 00:15:03 +0000
Subject: [PATCH] Makefile rearrangement.

svn path=/branches/kernel-image-2.6.11/; revision=3261
---
 debian/{Makefile.subarch => Makefile} |  0
 debian/Makefile.source                | 16 ---------------
 debian/rules                          | 28 ++++++++++++++++-----------
 3 files changed, 17 insertions(+), 27 deletions(-)
 rename debian/{Makefile.subarch => Makefile} (100%)
 delete mode 100644 debian/Makefile.source

diff --git a/debian/Makefile.subarch b/debian/Makefile
similarity index 100%
rename from debian/Makefile.subarch
rename to debian/Makefile
diff --git a/debian/Makefile.source b/debian/Makefile.source
deleted file mode 100644
index 309a9c200..000000000
--- a/debian/Makefile.source
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This is the Makefile for the binary linux-source
-# package. It must be built first, because it makes
-# the linux-source-$(version).tar.bz2 available.
-#
-binary: debian/control
-	dh_installdirs
-	dh_fixperms -plinux-source-$(version)
-	dh_installdocs -plinux-source-$(version) debian/README.Debian
-	dh_installchangelogs -plinux-source-$(version)
-	dh_compress -plinux-source-$(version)
-	dh_installdeb -plinux-source-$(version)
-	dh_gencontrol -plinux-source-$(version)
-	dh_builddeb -plinux-source-$(version)
-
-PHONY: binary
diff --git a/debian/rules b/debian/rules
index 6f4815f5f..01d13cb59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,13 @@ endif
 ifeq (,$(subarchs))
   subarchs := none
 endif
+#
+# The following definition gets the list of relevant files in the top-level
+# directory. At this point we cannot verify that we are in top-level dir
+# (we probably are), so it should be referenced only in the targets which 
+# run dh_testdir in the beginning.
+#
+source_files = $(filter-out debian linux-source-$(version), $(shell echo *))
 
 export version abiname ltver kbuildver flavours
 
@@ -64,7 +71,6 @@ unpatch:
 #
 spkg := linux-source-$(version)
 sdir := debian/$(spkg)/usr/src
-files = $(filter-out debian, $(shell echo *))
 source: debian/source-stamp
 debian/source-stamp: debian/patch-stamp
 	dh_testdir
@@ -72,7 +78,7 @@ debian/source-stamp: debian/patch-stamp
 	dh_installdirs -p$(spkg) /usr/src
 #	Link the files and create a tarball in correct location
 	mkdir $(spkg)
-	cp -al $(files) $(spkg)
+	cp -al $(source_files) $(spkg)
 	tar -cjf $(sdir)/$(spkg).tar.bz2 $(spkg)
 	rm -rf $(spkg)
 	dh_installdocs -p$(spkg) README
@@ -104,9 +110,9 @@ debian/tree-stamp:
 unpack: debian/linux-source-$(version).tar.bz2 unpack-stamp
 unpack-stamp:
 	dh_testdir
-	for i in $(subarchs); do				\
-	  cd debian; 						\
-	  $(MAKE) -f Makefile.subarch subarch=$${i} unpack;	\
+	for i in $(subarchs); do					\
+	  cd debian; 							\
+	  $(MAKE) subarch=$${i} source_files='$(source_files)' unpack;	\
 	done
 	ln -s $$(command -v touch) debian/bin/touch.orig
 	touch unpack-stamp
@@ -114,9 +120,9 @@ unpack-stamp:
 build: build-stamp
 build-stamp: unpack-stamp
 	dh_testdir
-	for i in $(subarchs); do				\
-	  cd debian;	 					\ 
-	  $(MAKE) -f Makefile.subarch subarch=$${i} build;	\
+	for i in $(subarchs); do					\
+	  cd debian;	 						\ 
+	  $(MAKE) subarch=$${i} source_files='$(source_files)' build;	\
 	done
 	touch build-stamp
 
@@ -133,9 +139,9 @@ clean: unpatch
 binary-indep: build
 binary-arch: build
 	dh_testdir
-	for i in $(subarchs); do                                \
-	  cd debian;						\
-	  $(MAKE) -f Makefile.subarch subarch=$${i} binary;	\	
+	for i in $(subarchs); do					\
+	  cd debian;							\
+	  $(MAKE) subarch=$${i} source_files='$(source_files)' binary;	\	
 	done
 
 binary:	binary-indep binary-arch