diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:07:49 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:07:49 +0200 |
commit | 800694cbf33e206935dc9e6e8fa6e9a036b8efad (patch) | |
tree | 1557d96ee0f463a020b11604146be66fb9809a31 /buildlib/configure.mak | |
parent | 6c0c0387e616f8d04f00916fbd1fe899acd265cd (diff) | |
parent | 1351329e376a8dbe7780693693d0f3db0ec749fa (diff) |
merged (and resolved a bunch of conflicts) of the debian-sid branch
Diffstat (limited to 'buildlib/configure.mak')
-rw-r--r-- | buildlib/configure.mak | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 310c2600c..c0d8e3c76 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE 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 + 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) + /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 |