Additional build fixes from autoconf merge.

This commit is contained in:
Karl MacMillan 0001-01-01 00:00:00 +00:00
parent 5dab9feafd
commit 1d2c024afa
8 changed files with 41 additions and 18 deletions

View File

@ -41,20 +41,18 @@ 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
configure:
cd ipa-server; ./configure --prefix=/usr --sysconfdir=/etc
cd ipa-client; ./configure --prefix=/usr --sysconfdir=/etc
install: all
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
clean:
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
rm -f *~
test:
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
@ -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

0
ipa-client/autogen.sh Normal file → Executable file
View File

View File

@ -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

View File

@ -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

0
ipa-server/autogen.sh Normal file → Executable file
View File

View File

@ -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

View File

@ -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

View File

@ -14,7 +14,7 @@ INCLUDES = \
$(NULL)
sbin_PROGRAMS = \
ipa-kpasswd \
ipa_kpasswd \
$(NULL)
ipa_kpasswd_SOURCES = \