summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl MacMillan <kmacmillan@redhat.com>2007-11-05 11:27:48 -0500
committerKarl MacMillan <kmacmillan@redhat.com>2007-11-05 11:27:48 -0500
commitde15549f8ebb17822d4390b71f8bd8166695635e (patch)
tree312b3fa35d439385492741ef6f4810ee7ab5f2fe
parent8cfd270f3441094390d16df9c0d59b0c7ce42284 (diff)
downloadfreeipa-de15549f8ebb17822d4390b71f8bd8166695635e.tar.gz
freeipa-de15549f8ebb17822d4390b71f8bd8166695635e.tar.xz
freeipa-de15549f8ebb17822d4390b71f8bd8166695635e.zip
Make it possible to force the running of autogen.
With the change to run autogen on make all if there was no makefile present, it became impossible to force the running of autogen when that is needed. Fix that by adding a bootstrap-autogen target that checks the existing of Makefiles and reverting the autogen target to always run autogen.
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 66eeeb119..dac507949 100644
--- a/Makefile
+++ b/Makefile
@@ -35,15 +35,19 @@ CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE)
CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION)
CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz
-all: autogen
+all: bootstrap-autogen
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
-autogen:
+bootstrap-autogen:
cd ipa-server; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc; fi
cd ipa-client; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc; fi
+autogen:
+ cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc;
+ cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc;
+
configure:
cd ipa-server; ./configure --prefix=/usr --sysconfdir=/etc
cd ipa-client; ./configure --prefix=/usr --sysconfdir=/etc