merge with my debian-sid branch

[apt.git] / buildlib / configure.mak

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index af6c35e38a5339693cab035a92025197497a45ad..310c2600c83561bbebb523de522778da01e01faf 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -13,15 +13,23 @@
 BUILDDIR=build
 
 .PHONY: startup
-startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) 
+startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
-configure: aclocal.m4 configure.in
+# use the files provided from the system instead of carry around
+# and use (most of the time outdated) copycats
+buildlib/config.sub:
+       ln -sf /usr/share/misc/config.sub buildlib/config.sub
+buildlib/config.guess:
+       ln -sf /usr/share/misc/config.guess buildlib/config.guess       
+configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
        autoconf
 
-aclocal.m4:
+aclocal.m4: $(wildcard buildlib/*.m4)
        aclocal -I buildlib
+       
 $(BUILDDIR)/config.status: configure
        /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)       
        (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
+       
 $(addprefix $(BUILDDIR)/,$(CONVERTED)):
        (cd $(BUILDDIR) && ./config.status)