>From 2c67e97e083724ce14a453fa3f5ca26bbc9478cc Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 24 Mar 2015 11:06:43 +0100 Subject: [PATCH 3/6] temp --- proxy/Makefile.am | 10 +++++----- proxy/contrib/gssproxy.spec.in | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index d892bd4067815d9b0561c90b8cc363a82dca6ff7..7b37c1e74ffdb4faf4130b7efdbd6884735d5b0b 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -221,6 +221,11 @@ endif ####################### dist_init_SCRIPTS = +systemdunit_DATA = +if HAVE_SYSTEMD_UNIT + systemdunit_DATA += \ + systemd/gssproxy.service +endif edit_cmd = $(SED) \ -e 's|@sbindir[@]|$(sbindir)|g' \ @@ -282,11 +287,6 @@ else mkdir -p $(DESTDIR)$(initdir) endif -install-data-hook: systemd/gssproxy.service examples/mech examples/gssproxy.conf -if HAVE_SYSTEMD_UNIT - cp systemd/gssproxy.service $(DESTDIR)$(systemdunitdir) -endif - clean-local: rm -Rf doc diff --git a/proxy/contrib/gssproxy.spec.in b/proxy/contrib/gssproxy.spec.in index 31ef05217f73b0ebfe27e8ce8d49da23f6d8b137..43975c30bfcbc2ae707290d0b2af2d77cdee7310 100644 --- a/proxy/contrib/gssproxy.spec.in +++ b/proxy/contrib/gssproxy.spec.in @@ -71,10 +71,8 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/gssproxy/proxymech.la install -d -m755 %{buildroot}%{_sysconfdir}/gssproxy -install -d -m755 %{buildroot}%{_unitdir} install -m644 examples/gssproxy.conf %{buildroot}%{_sysconfdir}/gssproxy/gssproxy.conf install -m644 examples/mech %{buildroot}%{_sysconfdir}/gss/mech -install -m644 systemd/gssproxy.service %{buildroot}%{_unitdir}/gssproxy.service %clean rm -rf %{buildroot} -- 2.3.3