[kernel] r9484 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Mon Sep 10 10:27:27 2007
New Revision: 9484

Log:
debian/rules.real
- Build documentation in a object only tree.
- Only install real makefiles.


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 10:27:27 2007
@@ -165,9 +165,9 @@
 $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
 $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
 	rm -rf $(DIR)
-	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	$(MAKE_CLEAN) -C $(DIR) $(JOBS_ARG) xmldocs
-	$(MAKE_CLEAN) -C $(DIR) $(JOBS_ARG) htmldocs mandocs
+	mkdir $(DIR)
+	$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) xmldocs
+	$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) htmldocs mandocs
 	touch '$@'
 
 $(STAMPS_DIR)/build-libc-dev: SOURCE_DIR = $(BUILD_DIR)/source
@@ -189,32 +189,32 @@
 
 install-doc: PACKAGE_NAME = linux-doc-$(VERSION)
 install-doc: DIR = $(BUILD_DIR)/build-doc
-install-doc: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-doc: SOURCE_DIR = $(BUILD_DIR)/source
+install-doc: PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-doc: OUT_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
 install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-doc: $(STAMPS_DIR)/build-doc
 	dh_clean -d -k
-	cd $(DIR); ls -1 COPYING CREDITS MAINTAINERS README REPORTING-BUGS \
-		|  cpio -pd --preserve-modification-time '$(OUT_DIR)'
-	cd $(DIR)/Documentation; \
+	mkdir -p $(OUT_DIR)
+	cp -a $(addprefix $(SOURCE_DIR)/, COPYING CREDITS MAINTAINERS README REPORTING-BUGS Documentation) $(OUT_DIR)
+	rm -rf $(OUT_DIR)/Documentation/DocBook
+	cd $(DIR)/Documentation/DocBook; \
 	find . \
-	  -path './DocBook/man/*' -prune -o \
-	  -path './DocBook/*' -a \( -name '*.tmpl' -o -name '*.xml' -o -name '*.9' \) -prune -o \
-	  \( -name 'Makefile*' -o -name '.*.cmd' -o -name '.gitignore' \) -prune -o \
+	  -path './man/*' -prune -o \
+	  \( -name '*.tmpl' -o -name '*.xml' -o -name '*.9' -o \
+	     -name 'Makefile*' -o -name '.*.cmd' -o -name '.gitignore' \) -prune -o \
 	  -print \
 	| \
-	cpio -pd --preserve-modification-time '$(OUT_DIR)/Documentation'
-	mv '$(OUT_DIR)/Documentation/DocBook' '$(OUT_DIR)/html'
-	-gzip -9qfr '$(OUT_DIR)/Documentation'
+	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
+	gzip -9qfr $(OUT_DIR)/Documentation
 	$(MAKE_SELF) install-base
 
 install-manual: PACKAGE_NAME = linux-manual-$(VERSION)
 install-manual: DIR=$(BUILD_DIR)/build-doc
-install-manual: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
 install-manual: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-manual: $(STAMPS_DIR)/build-doc
 	dh_clean -d -k
-	find '$(DIR)/Documentation/DocBook/' -name '*.9' | xargs dh_installman
+	find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
 	$(MAKE_SELF) install-base
 
 install-dummy: