Additional build fixes from autoconf merge.

8 files changed, 41 insertions, 18 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
diff --git a/ipa-client/autogen.sh b/ipa-client/autogen.sh
index 072bd15aa..072bd15aa 100644..100755
--- a/ipa-client/autogen.sh
+++ b/ipa-client/autogen.sh
diff --git a/ipa-client/freeipa-client.spec b/ipa-client/freeipa-client.spec
index 6a5790c16..7619a014b 100755
--- a/ipa-client/freeipa-client.spec
+++ b/ipa-client/freeipa-client.spec
@@ -1,6 +1,6 @@
 Name:           freeipa-client
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FreeIPA client
 
 Group:          System Environment/Base
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/*
 
 %changelog
+* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-2
+- Convert to autotools-based build
+
 * Thu Aug 16 2007 Simo Sorce <ssorce@redhat.com> - 0.1.0-1
 - Initial rpm version
 
diff --git a/ipa-client/freeipa-client.spec.in b/ipa-client/freeipa-client.spec.in
index 50b32a91a..fd199f681 100644
--- a/ipa-client/freeipa-client.spec.in
+++ b/ipa-client/freeipa-client.spec.in
@@ -1,6 +1,6 @@
 Name:           freeipa-client
 Version:        VERSION
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FreeIPA client
 
 Group:          System Environment/Base
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/*
 
 %changelog
+* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-2
+- Convert to autotools-based build
+
 * Thu Aug 16 2007 Simo Sorce <ssorce@redhat.com> - 0.1.0-1
 - Initial rpm version
 
diff --git a/ipa-server/autogen.sh b/ipa-server/autogen.sh
index 2e80fc216..2e80fc216 100644..100755
--- a/ipa-server/autogen.sh
+++ b/ipa-server/autogen.sh
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec
index 31fe01b66..a5461cd87 100755
--- a/ipa-server/freeipa-server.spec
+++ b/ipa-server/freeipa-server.spec
@@ -1,6 +1,6 @@
 Name:           freeipa-server
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
@@ -40,7 +40,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
-%{_sbindir}/ipa-kpasswd
+%{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa-webgui
 %attr(755,root,root) %{_initrddir}/ipa-kpasswd
 %attr(755,root,root) %{_initrddir}/ipa-webgui
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-3
+- Convert to autotools-based build
+
 * Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2
 - Package ipa-webgui
 
diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in
index a6498d34a..fc24bb19d 100644
--- a/ipa-server/freeipa-server.spec.in
+++ b/ipa-server/freeipa-server.spec.in
@@ -1,6 +1,6 @@
 Name:           freeipa-server
 Version:        VERSION
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
@@ -40,7 +40,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
-%{_sbindir}/ipa-kpasswd
+%{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa-webgui
 %attr(755,root,root) %{_initrddir}/ipa-kpasswd
 %attr(755,root,root) %{_initrddir}/ipa-webgui
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-3
+- Convert to autotools-based build
+
 * Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2
 - Package ipa-webgui
 
diff --git a/ipa-server/ipa-kpasswd/Makefile.am b/ipa-server/ipa-kpasswd/Makefile.am
index 4c1cf8c74..02145d251 100644
--- a/ipa-server/ipa-kpasswd/Makefile.am
+++ b/ipa-server/ipa-kpasswd/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES =							\
 	$(NULL)
 
 sbin_PROGRAMS =			\
-	ipa-kpasswd		\
+	ipa_kpasswd		\
 	$(NULL)
 
 ipa_kpasswd_SOURCES = 		\