summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKarl MacMillan <kmacmill@redhat.com>2007-10-18 10:48:48 -0400
committerKarl MacMillan <kmacmill@redhat.com>2007-10-18 10:48:48 -0400
commit1d2c024afa3fc2630cd2a1888c811609bfa6ef6a (patch)
tree47be8c802553e8570617f7eec0cf65e6bc8caece /Makefile
parent5dab9feafde6168fc22ac12429c6f214f78d6b22 (diff)
downloadfreeipa-1d2c024afa3fc2630cd2a1888c811609bfa6ef6a.tar.gz
freeipa-1d2c024afa3fc2630cd2a1888c811609bfa6ef6a.tar.xz
freeipa-1d2c024afa3fc2630cd2a1888c811609bfa6ef6a.zip
Additional build fixes from autoconf merge.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 22 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index e04d4cb93..61b4e19e2 100644
--- a/Makefile
+++ b/Makefile
@@ -41,19 +41,17 @@ all:
done
autogen:
- cd ipa-server && sh autogen.sh --prefix=/usr --sysconfdir=/etc
- cd ipa-client && sh autogen.sh --prefix=/usr --sysconfdir=/etc
+ cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc
+ cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc
-install: all
- @for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit 1; \
- done
+configure:
+ cd ipa-server; ./configure --prefix=/usr --sysconfdir=/etc
+ cd ipa-client; ./configure --prefix=/usr --sysconfdir=/etc
-clean:
+install: all
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
- rm -f *~
test:
@for subdir in $(SUBDIRS); do \
@@ -91,7 +89,7 @@ tarballs:
# ipa-server
mv dist/freeipa/ipa-server dist/$(SERV_TARBALL_PREFIX)
rm -f dist/$(SERV_TARBALL)
- cd dist/$(SERV_TARBALL_PREFIX); sh autogen.sh
+ cd dist/$(SERV_TARBALL_PREFIX); ./autogen.sh; make distclean
cd dist; tar cfz $(SERV_TARBALL) $(SERV_TARBALL_PREFIX)
rm -fr dist/$(SERV_TARBALL_PREFIX)
@@ -110,7 +108,7 @@ tarballs:
# ipa-client
mv dist/freeipa/ipa-client dist/$(CLI_TARBALL_PREFIX)
rm -f dist/$(CLI_TARBALL)
- cd dist/$(CLI_TARBALL_PREFIX); sh autogen.sh
+ cd dist/$(CLI_TARBALL_PREFIX); ./autogen.sh; make distclean
cd dist; tar cfz $(CLI_TARBALL) $(CLI_TARBALL_PREFIX)
rm -fr dist/$(CLI_TARBALL_PREFIX)
@@ -149,7 +147,20 @@ rpms: rpmroot rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client
dist: version-update archive tarballs archive-cleanup rpms
-local-dist: clean version-update local-archive tarballs archive-cleanup rpms
+local-dist: autogen clean version-update local-archive tarballs archive-cleanup rpms
+
+
+clean:
+ @for subdir in $(SUBDIRS); do \
+ (cd $$subdir && $(MAKE) $@) || exit 1; \
+ done
+ rm -f *~
+
+distclean:
+ @for subdir in $(SUBDIRS); do \
+ (cd $$subdir && $(MAKE) $@) || exit 1; \
+ done
+ rm -fr rpmbuild dist
maintainer-clean: clean
rm -fr rpmbuild dist