[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XOrg SVN commit: r64 - xorg-doc/trunk/debian



Author: fabbione
Date: 2004-10-19 22:42:41 -0500 (Tue, 19 Oct 2004)
New Revision: 64

Modified:
   xorg-doc/trunk/debian/CHANGESETS
   xorg-doc/trunk/debian/rules
Log:
* Define PROJECT_DIR in debian/rules.


Modified: xorg-doc/trunk/debian/CHANGESETS
===================================================================
--- xorg-doc/trunk/debian/CHANGESETS	2004-10-20 03:34:04 UTC (rev 63)
+++ xorg-doc/trunk/debian/CHANGESETS	2004-10-20 03:42:41 UTC (rev 64)
@@ -38,4 +38,7 @@
 * Add missing xorg-source-extras build dependency.
     61
 
+* Define PROJECT_DIR in debian/rules.
+    64
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-doc/trunk/debian/rules
===================================================================
--- xorg-doc/trunk/debian/rules	2004-10-20 03:34:04 UTC (rev 63)
+++ xorg-doc/trunk/debian/rules	2004-10-20 03:42:41 UTC (rev 64)
@@ -16,6 +16,7 @@
 
 SOURCE_TREE=build-tree/xc
 SOURCE_DIR=build-tree
+PROJECT_DIR=doc
 
 # dpkg-arch rules
 ifeq (,$(DEB_BUILD_GNU_TYPE))
@@ -35,15 +36,15 @@
 $(STAMP_DIR)/configure: $(patched)
 	dh_testdir
 	abspath=`pwd` && \
-	cd $(SOURCE_TREE)/doc && \
-	  imake -I/usr/share/xorg/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/doc -DUseInstalled && \
+	cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
+	  imake -I/usr/share/xorg/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/$(PROJECT_DIR) -DUseInstalled && \
 	  $(MAKE) Makefiles
 	touch $@
 
 build: $(STAMP_DIR)/build
 $(STAMP_DIR)/build: patch-audit configure
 	dh_testdir
-	cd $(SOURCE_TREE)/doc && \
+	cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
 	 $(MAKE)
 	touch $@
 
@@ -52,7 +53,7 @@
 	dh_testdir
 	dh_testroot
 	abspath=`pwd` && \
-	cd $(SOURCE_TREE)/doc && \
+	cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
 	  $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp
 	# Install lintian override.
 	install -d -m 755 debian/tmp/usr/share/lintian/overrides/



Reply to: