From c49d478b92843de3395a82b012847da8958afa2b Mon Sep 17 00:00:00 2001 From: Karl MacMillan Date: Thu, 18 Oct 2007 10:02:26 -0400 Subject: Fix build from autoconf patch import. --- Makefile | 10 +++++++++- ipa-client/AUTHORS | 0 ipa-client/NEWS | 0 ipa-client/README | 0 ipa-client/freeipa-client.spec | 6 +++--- ipa-client/freeipa-client.spec.in | 6 +++--- ipa-server/AUTHORS | 0 ipa-server/NEWS | 0 ipa-server/README | 0 ipa-server/freeipa-server.spec | 12 +++++++----- ipa-server/freeipa-server.spec.in | 12 +++++++----- ipa-server/ipa-slapi-plugins/dna/Makefile.am | 2 ++ ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am | 2 ++ ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 2 ++ 14 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 ipa-client/AUTHORS create mode 100644 ipa-client/NEWS create mode 100644 ipa-client/README create mode 100644 ipa-server/AUTHORS create mode 100644 ipa-server/NEWS create mode 100644 ipa-server/README diff --git a/Makefile b/Makefile index dc2a4837..6f89094d 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,10 @@ all: (cd $$subdir && $(MAKE) $@) || exit 1; \ done +autogen: + cd ipa-server && sh autogen.sh --prefix=/usr --sysconfdir=/etc + cd ipa-client && sh autogen.sh --prefix=/usr --sysconfdir=/etc + install: all @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ @@ -87,6 +91,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; tar cfz $(SERV_TARBALL) $(SERV_TARBALL_PREFIX) rm -fr dist/$(SERV_TARBALL_PREFIX) @@ -105,6 +110,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; tar cfz $(CLI_TARBALL) $(CLI_TARBALL_PREFIX) rm -fr dist/$(CLI_TARBALL_PREFIX) @@ -145,5 +151,7 @@ dist: version-update archive tarballs archive-cleanup rpms local-dist: clean version-update local-archive tarballs archive-cleanup rpms -dist-clean: clean +maintainer-clean: clean rm -fr rpmbuild dist + cd ipa-server && $(MAKE) maintainer-clean + cd ipa-client && $(MAKE) maintainer-clean diff --git a/ipa-client/AUTHORS b/ipa-client/AUTHORS new file mode 100644 index 00000000..e69de29b diff --git a/ipa-client/NEWS b/ipa-client/NEWS new file mode 100644 index 00000000..e69de29b diff --git a/ipa-client/README b/ipa-client/README new file mode 100644 index 00000000..e69de29b diff --git a/ipa-client/freeipa-client.spec b/ipa-client/freeipa-client.spec index 67e241d6..6a5790c1 100755 --- a/ipa-client/freeipa-client.spec +++ b/ipa-client/freeipa-client.spec @@ -17,16 +17,16 @@ The client package provide install and configuration scripts for clients. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -make install DESTDIR=%{buildroot} +make install %clean diff --git a/ipa-client/freeipa-client.spec.in b/ipa-client/freeipa-client.spec.in index 3644e157..50b32a91 100644 --- a/ipa-client/freeipa-client.spec.in +++ b/ipa-client/freeipa-client.spec.in @@ -17,16 +17,16 @@ The client package provide install and configuration scripts for clients. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -make install DESTDIR=%{buildroot} +make install %clean diff --git a/ipa-server/AUTHORS b/ipa-server/AUTHORS new file mode 100644 index 00000000..e69de29b diff --git a/ipa-server/NEWS b/ipa-server/NEWS new file mode 100644 index 00000000..e69de29b diff --git a/ipa-server/README b/ipa-server/README new file mode 100644 index 00000000..e69de29b diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index eaca6ac1..31fe01b6 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -21,17 +21,16 @@ FreeIPA is a server for identity, policy, and audit. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{plugin_dir} -make install DESTDIR=%{buildroot} LIBDIR=%{buildroot}%{_libdir} +make install %clean @@ -41,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 @@ -50,8 +49,11 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so +%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.la %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.la %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.la %changelog diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in index 1b7e219f..a6498d34 100644 --- a/ipa-server/freeipa-server.spec.in +++ b/ipa-server/freeipa-server.spec.in @@ -21,17 +21,16 @@ FreeIPA is a server for identity, policy, and audit. %prep %setup -q +./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc %build -make DESTDIR=%{buildroot} +make %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{plugin_dir} -make install DESTDIR=%{buildroot} LIBDIR=%{buildroot}%{_libdir} +make install %clean @@ -41,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 @@ -50,8 +49,11 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so +%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.la %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.la %attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so +%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.la %changelog diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile.am b/ipa-server/ipa-slapi-plugins/dna/Makefile.am index d8d6d1d7..57a99764 100644 --- a/ipa-server/ipa-slapi-plugins/dna/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/dna/Makefile.am @@ -23,6 +23,8 @@ libipa_dna_plugin_la_SOURCES = \ dna.c \ $(NULL) +libipa_dna_plugin_la_LDFLAGS = -avoid-version + libipa_dna_plugin_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am index bc236c32..54ddd538 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile.am @@ -23,6 +23,8 @@ libipa_memberof_plugin_la_SOURCES = \ ipa-memberof.c \ $(NULL) +libipa_memberof_plugin_la_LDFLAGS = -avoid-version + libipa_memberof_plugin_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 68424383..5c0fb232 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -23,6 +23,8 @@ libipa_pwd_extop_la_SOURCES = \ ipa_pwd_extop.c \ $(NULL) +libipa_pwd_extop_la_LDFLAGS = -avoid-version + libipa_pwd_extop_la_LIBADD = \ $(MOZLDAP_LIBS) \ $(NULL) -- cgit