summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--proxy/Makefile.am19
-rw-r--r--proxy/contrib/gssproxy.spec.in2
2 files changed, 13 insertions, 8 deletions
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 9675aeb..1e7c39c 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -222,6 +222,13 @@ endif
#######################
dist_init_SCRIPTS =
+systemdunit_DATA =
+if HAVE_SYSTEMD_UNIT
+ systemdunit_DATA += \
+ systemd/gssproxy.service
+endif
+
+noinst_DATA = examples/gssproxy.conf examples/mech
edit_cmd = $(SED) \
-e 's|@sbindir[@]|$(sbindir)|g' \
@@ -242,12 +249,15 @@ EXTRA_DIST = \
examples/mech.in
systemd/gssproxy.service: systemd/gssproxy.service.in Makefile
+ @$(MKDIR_P) systemd/
$(replace_script)
examples/gssproxy.conf: examples/gssproxy.conf.in Makefile
+ @$(MKDIR_P) examples/
$(replace_script)
examples/mech: examples/mech.in Makefile
+ @$(MKDIR_P) examples/
$(replace_script)
installgsspdirs::
@@ -280,15 +290,12 @@ 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
-CLEANFILES = *.X */*.X */*/*.X
+CLEANFILES = *.X */*.X */*/*.X \
+ examples/mech \
+ examples/gssproxy.conf
tests: all $(check_PROGRAMS)
$(srcdir)/tests/runtests.py
diff --git a/proxy/contrib/gssproxy.spec.in b/proxy/contrib/gssproxy.spec.in
index 8f9f823..185317c 100644
--- a/proxy/contrib/gssproxy.spec.in
+++ b/proxy/contrib/gssproxy.spec.in
@@ -71,11 +71,9 @@ 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
mkdir -p %{buildroot}%{_sysconfdir}/gss/mech.d
install -m644 examples/mech %{buildroot}%{_sysconfdir}/gss/mech.d/gssproxy.conf
-install -m644 systemd/gssproxy.service %{buildroot}%{_unitdir}/gssproxy.service
%clean
rm -rf %{buildroot}