>From 6f56a3fc15b7919448efcd5a5da5be11d97514c8 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 24 Mar 2015 11:11:17 +0100 Subject: [PATCH] Fix few build issues - use automake variables for simplification of file installation instead of make install hooks - if configure is not called from $srcdir then few directories were not created. - few files were not removed with make unistall Signed-off-by: Lukas Slebodnik --- proxy/Makefile.am | 19 +++++++++++++------ proxy/contrib/gssproxy.spec.in | 2 -- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 109a1af20fffc76e703112041ba2f4e297fdbefc..fed06f27e87bf0f060ecff50b81c86145c1f218d 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -221,6 +221,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' \ @@ -241,12 +248,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:: @@ -279,15 +289,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 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