show right binary name in simulation notice

[apt.git] / buildlib / configure.mak

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 68d0535b41ed4947f9ee2d105ee3c254b396cb81..e1a511544629225933f350ca05fd4c70a9d9ffa3 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -2,7 +2,7 @@
 
 # This make fragment is included by the toplevel make to handle configure
 # and setup. It defines a target called startup that when run will init
 
 # This make fragment is included by the toplevel make to handle configure
 # and setup. It defines a target called startup that when run will init

-# the build directory, generate configure from configure.in, create aclocal
+# the build directory, generate configure from configure.ac, create aclocal

 # and has rules to run config.status should one of the .in files change.
 
 # Input
 # and has rules to run config.status should one of the .in files change.
 
 # Input


@@ -13,7 +13,7 @@
 BUILDDIR=build
 
 .PHONY: startup missing-config-files
 BUILDDIR=build
 
 .PHONY: startup missing-config-files

-startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
+startup: $(BUILDDIR)/configure-stamp $(addprefix $(BUILDDIR)/,$(CONVERTED))

 
 # use the files provided from the system instead of carry around
 # and use (most of the time outdated) copycats
 
 # use the files provided from the system instead of carry around
 # and use (most of the time outdated) copycats


@@ -48,14 +48,15 @@ missing-config-files:
        @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
        exit 100
 
        @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
        exit 100
 

-configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
+configure: aclocal.m4 configure.ac

        autoconf
 
 aclocal.m4: $(wildcard buildlib/*.m4)
        aclocal -I buildlib
 
        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)
+$(BUILDDIR)/configure-stamp: configure buildlib/config.guess buildlib/config.sub
+       /usr/bin/test -e '$(BUILDDIR)' || mkdir '$(BUILDDIR)'
+       (HERE="`pwd`"; cd '$(BUILDDIR)' && "$$HERE/configure")
+       touch '$(BUILDDIR)/configure-stamp'

 
 

-$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/configure-stamp