瀏覽代碼

Better generation of control, fix up DESTDIR

David Schleef 24 年之前
父節點
當前提交
d00f43f966
共有 3 個文件被更改,包括 8 次插入9 次删除
  1. 1 2
      debian/control
  2. 1 2
      debian/control.in
  3. 6 5
      debian/rules

+ 1 - 2
debian/control

@@ -2,7 +2,7 @@ Source: uclibc
 Section: devel
 Section: devel
 Priority: optional
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
 Maintainer: David Schleef <ds@schleef.org>
-Build-Depends: debhelper
+Build-Depends: debhelper, kernel-headers-2.4.5
 Standards-Version: 3.5.2
 Standards-Version: 3.5.2
 
 
 Package: libuclibc-dev
 Package: libuclibc-dev
@@ -32,4 +32,3 @@ Description: A compiler wrapper for uClibc
  to do compilation against uClibc instead of the native libc.
  to do compilation against uClibc instead of the native libc.
  This package is used for cross compiling.
  This package is used for cross compiling.
 
 
-

+ 1 - 2
debian/control.in

@@ -2,7 +2,7 @@ Source: uclibc
 Section: devel
 Section: devel
 Priority: optional
 Priority: optional
 Maintainer: David Schleef <ds@schleef.org>
 Maintainer: David Schleef <ds@schleef.org>
-Build-Depends: debhelper
+Build-Depends: debhelper, kernel-headers-2.4.5
 Standards-Version: 3.5.2
 Standards-Version: 3.5.2
 
 
 Package: libuclibc-dev_TARGET_
 Package: libuclibc-dev_TARGET_
@@ -32,4 +32,3 @@ Description: A compiler wrapper for uClibc
  to do compilation against uClibc instead of the native libc.
  to do compilation against uClibc instead of the native libc.
  This package is used for cross compiling.
  This package is used for cross compiling.
 
 
-

+ 6 - 5
debian/rules

@@ -29,11 +29,11 @@ p_dev=libuclibc-dev$(target_suffix)
 p_lib=libuclibc0$(target_suffix)
 p_lib=libuclibc0$(target_suffix)
 p_gcc=uclibc$(target_suffix)-gcc
 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
 	sed s/_TARGET_/$(target_suffix)/ debian/control.in >debian/control
 
 
 build: build-stamp
 build: build-stamp
-build-stamp:
+build-stamp: debian/control
 	dh_testdir
 	dh_testdir
 
 
 	# Add here commands to compile the package.
 	# Add here commands to compile the package.
@@ -45,18 +45,19 @@ ifneq ($(target),$(DEB_HOST_GNU_CPU))
 	echo 'CROSS = $(target)-linux-'  >>Config
 	echo 'CROSS = $(target)-linux-'  >>Config
 endif
 endif
 	echo 'DOPIC = true'  >>Config
 	echo 'DOPIC = true'  >>Config
-	echo 'PREFIX = $$(DESTDIR)/usr'  >>Config
+	echo 'PREFIX = /usr'  >>Config
 	echo 'DEVEL_PREFIX = $$(PREFIX)/$$(TARGET_ARCH)-linux-uclibc'  >>Config
 	echo 'DEVEL_PREFIX = $$(PREFIX)/$$(TARGET_ARCH)-linux-uclibc'  >>Config
-	echo 'TARGET_PREFIX = $$(DESTDIR)/'  >>Config
+	echo 'TARGET_PREFIX = /'  >>Config
 ifeq ($(with_shared_libs),n)
 ifeq ($(with_shared_libs),n)
 	echo 'HAVE_SHARED = false' >>Config
 	echo 'HAVE_SHARED = false' >>Config
 endif
 endif
+	echo 'KERNEL_SOURCE = /usr/src/kernel-headers-2.4.5' >>Config
 
 
 	$(MAKE)
 	$(MAKE)
 
 
 	touch build-stamp
 	touch build-stamp
 
 
-clean:
+clean: debian/control
 	dh_testdir
 	dh_testdir
 	dh_testroot
 	dh_testroot
 	rm -f build-stamp
 	rm -f build-stamp