append the dist (e.g. sid, wheezy) as a query string when

[apt.git] / buildlib / configure.mak

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 64c3179d1af117fa8f12ec309bd6fd70cf406d1d..310c2600c83561bbebb523de522778da01e01faf 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -6,30 +6,30 @@
 # and has rules to run config.status should one of the .in files change.
 
 # Input
-#  BUILD - The build director
+#  BUILDDIR - The build directory
 #  CONVERTED - List of files output by configure $(BUILD) is prepended
 #              The caller must provide depends for these files
 # It would be a fairly good idea to run this after a cvs checkout.
-BUILD=build
+BUILDDIR=build
 
 .PHONY: startup
-startup: configure $(addprefix $(BUILD)/,$(CONVERTED))
+startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
-configure: aclocal.m4 configure.in
-       autoconf        
-aclocal.m4:
-       aclocal -I buildlib
-$(BUILD)/config.status: configure
-       test -e $(BUILD) || mkdir $(BUILD)      
-       (HERE=`pwd`; cd $(BUILD) && $$HERE/configure)
-$(CONVERTED): $(BUILD)/config.status
-       (cd $(BUILD) && ./config.status)
-
-# We include the environment if it exists and re-export it to configure. This
-# allows someone to edit it and not have their changes blown away.
-Env = $(wildcard $(BUILD)/environment.mak)
-ifneq ($(words $(Env)),0)
-include $(Env)
-export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PICFLAGS
-endif
+# 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: $(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)