From 3998078461f9e8484e91449f895e6a444b6f6245 Mon Sep 17 00:00:00 2001 From: rcrit Date: Mon, 15 Mar 2010 11:40:58 -0400 Subject: Fix the client and client-rpms make targets --- Makefile | 2 ++ ipa.spec.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b881a0872..73ab76856 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/ipa.spec.in b/ipa.spec.in index 61209de8e..d9b362878 100644 --- a/ipa.spec.in +++ b/ipa.spec.in @@ -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} -- cgit