X Strike Force X.Org X11 SVN commit: r1407 - trunk/xsfbs
Author: dnusinow
Date: 2006-03-07 00:42:07 -0500 (Tue, 07 Mar 2006)
New Revision: 1407
Modified:
trunk/xsfbs/xsfbs-autoreconf.mk
Log:
Apply fixes from Eugene.
Modified: trunk/xsfbs/xsfbs-autoreconf.mk
===================================================================
--- trunk/xsfbs/xsfbs-autoreconf.mk 2006-03-07 03:58:52 UTC (rev 1406)
+++ trunk/xsfbs/xsfbs-autoreconf.mk 2006-03-07 05:42:07 UTC (rev 1407)
@@ -35,7 +35,7 @@
RECONF_NOLINKFILES += aclocal.m4
# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~
+RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
# Internal target. Never invoke directly.
stampdir_target+=check.md5sum
@@ -44,7 +44,7 @@
$(MAKE) -f debian/rules prepare
for F in $(RECONF_CHECKFILES); do \
find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- xargs --no-run-if-empty md5sum >>$@; \
+ LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
done
# Internal target. Never invoke directly.
@@ -93,6 +93,12 @@
-a ! -wholename ./debian -a ! -wholename ./patches \
-a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
xargs -i{} cp -al {} $(RECONF_DIR)/before/
+
+ for F in $(RECONF_PRUNEFILES); do \
+ find $(RECONF_DIR)/before -name $$F -print | \
+ xargs --no-run-if-empty rm -r; \
+ done
+
cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
for F in $(RECONF_NOLINKFILES); do \
Reply to: