Fix the client and client-rpms make targets

This commit is contained in:
rcrit
2010-03-15 11:40:58 -04:00
committed by Jason Gerard DeRose
parent d13fcb6a0c
commit 3998078461
2 changed files with 4 additions and 2 deletions

View File

@@ -60,6 +60,7 @@ bootstrap-autogen: version-update client-autogen
client-autogen: version-update
cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR) --with-openldap; fi
cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
install: all server-install
@for subdir in $(SUBDIRS); do \
@@ -70,6 +71,7 @@ client-install: client
@for subdir in $(CLIENTDIRS); do \
(cd $$subdir && $(MAKE) install) || exit 1; \
done
cd install/po && $(MAKE) install || exit 1;
if [ "$(DESTDIR)" = "" ]; then \
python setup-client.py install; \
else \

View File

@@ -276,12 +276,12 @@ ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
%{buildroot}%{_usr}/share/ipa/html/unauthorized.html
# So we can own our Apache configuration
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ipa/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/ipa/default.conf
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
%endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ipa/
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/ipa/default.conf
mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
%if ! %{ONLY_CLIENT}