X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d2cca6ec46865a1f5167f846e67150dc19ca2022..ae2a6be8a2155c136f9535abfbcc750c8c395cd2:/buildlib/configure.mak diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 68d0535b4..e1a511544 100644 --- 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 -# 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 @@ -13,7 +13,7 @@ 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 @@ -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 -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 -$(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