X Strike Force XOrg SVN commit: r62 - xorg-config/trunk/debian
Author: fabbione
Date: 2004-10-19 11:01:06 -0500 (Tue, 19 Oct 2004)
New Revision: 62
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/rules
Log:
Define PROJECT_DIR in debian/rules.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-19 15:14:42 UTC (rev 61)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-19 16:01:06 UTC (rev 62)
@@ -106,4 +106,7 @@
+ Rediff several patches.
55
+* Define PROJECT_DIR in debian/rules.
+ 62
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules 2004-10-19 15:14:42 UTC (rev 61)
+++ xorg-config/trunk/debian/rules 2004-10-19 16:01:06 UTC (rev 62)
@@ -16,6 +16,7 @@
SOURCE_TREE=build-tree/xc
SOURCE_DIR=build-tree
+PROJECT_DIR=config
# dpkg-arch rules
ifeq (,$(DEB_BUILD_GNU_TYPE))
@@ -34,8 +35,8 @@
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(patched)
dh_testdir
- echo "" > $(SOURCE_TREE)/config/cf/date.def
- echo "" > $(SOURCE_TREE)/config/cf/host.def
+ echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/date.def
+ echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/host.def
# create symlink to not depend on X11
cd $(SOURCE_TREE)/include && \
ln -sf . X11
@@ -50,7 +51,7 @@
$(MAKE) -f xmakefile version.def && \
$(MAKE) Makefile.boot
# build all config dir
- cd $(SOURCE_TREE)/config && \
+ cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
./imake/imake -Icf -DTOPDIR=../ -DCURDIR=. && \
$(MAKE) Makefiles && \
$(MAKE) all
@@ -61,7 +62,7 @@
dh_testdir
dh_testroot
abspath=`pwd` && \
- cd $(SOURCE_TREE)/config && \
+ 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: