Merge my tree and the remote tree (no change, I guess)

[apt.git] / buildlib / configure.mak

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 2124ef887e074eda8f6855543cb5adfa62b1f01f..c0d8e3c768d17f1ab75c07da43938221b6bbf5e3 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -13,15 +13,22 @@
 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
-       test -e $(BUILDDIR) || mkdir $(BUILDDIR)        
+       /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
        (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
-$(addprefix $(BUILDDIR)/,$(CONVERTED)):
-       (cd $(BUILDDIR) && ./config.status)
+
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status