Better generation of control, fix up DESTDIR

3 files changed, 8 insertions, 9 deletions

diff --git a/debian/control b/debian/control
index 72acf8d80..44a74ff53 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: uclibc
 Section: devel
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
-Build-Depends: debhelper
+Build-Depends: debhelper, kernel-headers-2.4.5
 Standards-Version: 3.5.2
 
 Package: libuclibc-dev
@@ -32,4 +32,3 @@ Description: A compiler wrapper for uClibc
  to do compilation against uClibc instead of the native libc.
  This package is used for cross compiling.
 
-
diff --git a/debian/control.in b/debian/control.in
index d03e3732b..9443af936 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: uclibc
 Section: devel
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
-Build-Depends: debhelper
+Build-Depends: debhelper, kernel-headers-2.4.5
 Standards-Version: 3.5.2
 
 Package: libuclibc-dev_TARGET_
@@ -32,4 +32,3 @@ Description: A compiler wrapper for uClibc
  to do compilation against uClibc instead of the native libc.
  This package is used for cross compiling.
 
-
diff --git a/debian/rules b/debian/rules
index 43163582e..ae70b0665 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,11 @@ p_dev=libuclibc-dev$(target_suffix)
 p_lib=libuclibc0$(target_suffix)
 p_gcc=uclibc$(target_suffix)-gcc
 
-debian/control: debian/control.in
+debian/control: debian/control.in debian/rules
 	sed s/_TARGET_/$(target_suffix)/ debian/control.in >debian/control
 
 build: build-stamp
-build-stamp:
+build-stamp: debian/control
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -45,18 +45,19 @@ ifneq ($(target),$(DEB_HOST_GNU_CPU))
 	echo 'CROSS = $(target)-linux-'  >>Config
 endif
 	echo 'DOPIC = true'  >>Config
-	echo 'PREFIX = $$(DESTDIR)/usr'  >>Config
+	echo 'PREFIX = /usr'  >>Config
 	echo 'DEVEL_PREFIX = $$(PREFIX)/$$(TARGET_ARCH)-linux-uclibc'  >>Config
-	echo 'TARGET_PREFIX = $$(DESTDIR)/'  >>Config
+	echo 'TARGET_PREFIX = /'  >>Config
 ifeq ($(with_shared_libs),n)
 	echo 'HAVE_SHARED = false' >>Config
 endif
+	echo 'KERNEL_SOURCE = /usr/src/kernel-headers-2.4.5' >>Config
 
 	$(MAKE)
 
 	touch build-stamp
 
-clean:
+clean: debian/control
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp