X Strike Force X.Org X11 SVN commit: r3821 - branches/experimental/mesa/debian
Author: beatle
Date: 2006-10-15 10:41:12 -0400 (Sun, 15 Oct 2006)
New Revision: 3821
Modified:
branches/experimental/mesa/debian/rules
Log:
Use STAMP_DIR consistently throughout the debian/rules file.
Make the BUILD_STAMPS targets depend on patch so that when they are built
separately the patches will also be applied. Thanks to Michel D?\195?\164nzer for
catching this.
Make symlinking the source tree idempotent by adding the -f option to cp.
Thanks again Michel D?\195?\164nzer.
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-15 13:30:22 UTC (rev 3820)
+++ branches/experimental/mesa/debian/rules 2006-10-15 14:41:12 UTC (rev 3821)
@@ -9,7 +9,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-QUILT_STAMPFN ?= debian/stamp/patch
+STAMP_DIR = debian/stamp
+
+QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
CFLAGS = -Wall -g
@@ -28,8 +30,6 @@
export DEB_BUILD_ARCH
-STAMPDIR = debian/stamp
-
# build the following configurations
CONFIGS = debian \
debian-arch \
@@ -40,19 +40,22 @@
debian-osmesa32-static \
debian-static
-STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
+STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
-debian/stamp:
+$(STAMP_DIR):
dh_testdir
- mkdir -p debian/stamp
+ mkdir -p $@
-build: debian/stamp patch $(BUILD_STAMPS)
-$(STAMP)-build-%:
+$(QUILT_STAMPFN): $(STAMP_DIR)
+
+build: $(BUILD_STAMPS)
+$(STAMP)-build-%: patch
dh_testdir
mkdir -p $(DEB_BUILD_DIR)/$*
- find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | xargs cp -rl -t $(DEB_BUILD_DIR)/$*
+ find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
+ xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
touch $@
@@ -74,7 +77,7 @@
clean: unpatch
dh_testdir
dh_testroot
- rm -rf $(DEB_BUILD_DIR) debian/stamp
+ rm -rf $(DEB_BUILD_DIR) $(STAMP_DIR)
dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
# Build architecture-independent files here.
Reply to: