tags 424168 + patch tags 424169 + patch thanks On Thu, 2007-06-07 at 12:25 -0400, Roberto C.Sánchez wrote: > OK. I will try and tackle it this weekend.
Did you have time to try it? I did some tests myself and found that building in a separate build directory may not be enough because of how the build system is set up. However, the attached patch changes debian/rules so that we don't leave any of our cruft or changes behind after a clean. I intend to do some more investigation before committing it, though, because it only solves half of the problem. The CMU build system blows away some files that I'm not yet sure how to get back after a build. -- Fabian Fagerholm <[EMAIL PROTECTED]>
Index: debian/rules
===================================================================
--- debian/rules (revision 243)
+++ debian/rules (working copy)
@@ -69,14 +69,26 @@
# Some convenience variables
export TMPPKG := $(CURDIR)/debian/tmp
-AUTOTOOLS=rm -f acinclude.m4 aclocal.m4 config/config.sub \
- config/config.guess config/ltmain.sh config/libtool.m4 && \
- libtoolize --force && \
- aclocal-1.9 -I $(CURDIR)/cmulocal -I $(CURDIR)/config && \
- autoheader && \
- autoconf && \
- automake-1.9 --add-missing --include-deps && \
- touch stamp-h.in
+AUTOFILES=acinclude.m4 aclocal.m4 config/config.sub config/config.guess \
+ config/ltmain.sh config/libtool.m4
+BUILD_TMP_SUFFIX=.debian-build.tmp
+AUTOTOOLS=for i in $(AUTOFILES); do \
+ if [ -e $$i ]; then \
+ mv --verbose $$i `basename $$i`$(BUILD_TMP_SUFFIX) ; \
+ fi ; \
+ done && \
+ libtoolize --force && \
+ aclocal-1.9 -I $(CURDIR)/cmulocal -I $(CURDIR)/config && \
+ autoheader && \
+ autoconf && \
+ automake-1.9 --add-missing --include-deps && \
+ touch stamp-h.in
+AUTOTOOLS_REVERSE=for i in $(AUTOFILES); do \
+ if [ -e `basename $$i`$(BUILD_TMP_SUFFIX) ]; then \
+ if [ -e $$i ]; then rm -fv $$i; fi ; \
+ mv --verbose `basename $$i`$(BUILD_TMP_SUFFIX) $$i ; \
+ fi ; \
+ done
### The Makefile targets begin. ###
@@ -92,14 +104,10 @@
dh_testroot
rm -f build-stamp
-ifneq "$(wildcard config.sub.old)" ""
- mv config.sub.old config/config.sub
-endif
-ifneq "$(wildcard config.guess.old)" ""
- mv config.guess.old config/config.guess
-endif
rm -f $(CURDIR)/sample/{sample-client,sample-server,config.h}
-$(MAKE) distclean
+ $(AUTOTOOLS_REVERSE)
+ (cd saslauthd && $(AUTOTOOLS_REVERSE) && cd ..)
-rm -f config.h config.log autom4ate.cache
dh_clean
@@ -111,13 +119,6 @@
config.status: patch configure
dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- mv -f config/config.sub config.sub.old
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- mv -f config/config.guess config.guess.old
-endif
-
# Avoid problems with timestamp skew and autotools.
touch configure
$(AUTOTOOLS)
signature.asc
Description: This is a digitally signed message part
