Author: waldi
Date: Mon Sep 10 15:16:09 2007
New Revision: 9492
Log:
debian/rules.real: Simplify linux-libc-dev installation.
Modified:
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Mon Sep 10 15:16:09 2007
@@ -163,13 +163,6 @@
$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG)
htmldocs mandocs
touch '$@'
-$(STAMPS_DIR)/build-libc-dev: SOURCE_DIR = $(BUILD_DIR)/source
-$(STAMPS_DIR)/build-libc-dev: DIR = $(BUILD_DIR)/build-libc-dev
-$(STAMPS_DIR)/build-libc-dev: $(STAMPS_DIR)/source
- rm -rf '$(DIR)'
- cp -al '$(SOURCE_DIR)' '$(DIR)'
- touch '$@'
-
install-base:
dh_installchangelogs
dh_installdocs
@@ -330,16 +323,19 @@
install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev
install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-libc-dev
-install-libc-dev_$(ARCH): DIR = debian/$(PACKAGE_NAME)/usr
-install-libc-dev_$(ARCH): $(STAMPS_DIR)/build-libc-dev
+install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/source
+install-libc-dev_$(ARCH): DIR = $(BUILD_DIR)/build-libc-dev
+install-libc-dev_$(ARCH): OUT_DIR = debian/$(PACKAGE_NAME)/usr
+install-libc-dev_$(ARCH):
dh_testdir
dh_testroot
dh_clean -d -k
- $(MAKE_CLEAN) -C $(SOURCE_DIR) headers_check ARCH=$(HEADERS_ARCH)
- $(MAKE_CLEAN) -C $(SOURCE_DIR) headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
+ rm -rf '$(DIR)'
+ mkdir $(DIR)
+ $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check
ARCH=$(HEADERS_ARCH)
+ $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install
ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
# XXX: Needs to be removed from libc6-dev
- rm -rf $(DIR)/include/scsi
+ rm -rf $(OUT_DIR)/include/scsi
$(MAKE_SELF) install-base
# XXX: This needs to be moved into the config
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
