From d757edd2f380a29ee521f6a49c24e384fb4628c8 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sun, 17 Apr 2005 02:44:02 +0000
Subject: [PATCH]   * Put the compiled modules into KPKG_DEST_DIR if set.  This
 appears to     be preferred over DEB_DEST by the make-kpkg documentation. 
 Thanks,     Jonas Smedegaard.  (Closes: #206403)

---
 debian/changelog |  3 +++
 debian/rules     | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18f11e6d7..0040c07e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openafs (1.3.81-4) UNRELEASED; urgency=low
 
   * make-kpkg doesn't run fakeroot for us but instead expects the module
     rules file to use $(ROOT_CMD) appropriately.  (Closes: #237861)
+  * Put the compiled modules into KPKG_DEST_DIR if set.  This appears to
+    be preferred over DEB_DEST by the make-kpkg documentation.  Thanks,
+    Jonas Smedegaard.  (Closes: #206403)
 
  --
 
diff --git a/debian/rules b/debian/rules
index 55c733e83..91fb1711f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,11 +24,14 @@ modulepkg=$(shell echo openafs-modules-$(KVERS)${INT_SUBARCH})
 ifndef KSRC
 KSRC=/usr/src/linux
 endif
-MODDIR=..
-LINTIAN_PACKAGES= openafs-client openafs-fileserver
+ifndef KPKG_DEST_DIR
+KPKG_DEST_DIR=..
+endif
 export KSRC 
 export KVERS
+export KPKG_DEST_DIR
 
+LINTIAN_PACKAGES= openafs-client openafs-fileserver
 
 configure: configure-stamp
 configure-stamp:
@@ -172,14 +175,14 @@ binary:   binary-indep binary-arch
 
 ############################Module package support
 kdist_image:  build-modules
-	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules MODDIR=$(KSRC)/.. binary-modules
-	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules MODDIR=$(KSRC)/.. clean
+	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary-modules
+	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
 
 kdist:  build-modules
-	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules MODDIR=$(KSRC)/.. KERNEL_DEPENDS=y binary-modules
+	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules KERNEL_DEPENDS=y binary-modules
 	KSRC="$(KSRC)" KMAINT="$(KMAINT)" KEMAIL="$(KEMAIL)" \
 		sh -v debian/genchanges.sh
-	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules MODDIR=$(KSRC)/.. clean
+	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
 
 
 
@@ -271,4 +274,4 @@ endif
 		-Pdebian/$(modulepkg)
 	chown -R root.root debian/$(modulepkg)
 	chmod -R go=rX debian/$(modulepkg)
-	dpkg --build debian/$(modulepkg) $(MODDIR)
+	dpkg --build debian/$(modulepkg) $(KPKG_DEST_DIR)
-- 
2.39.5