Fix variable replacement in non config files

Fixes: #132

Signed-off-by: Simo Sorce <[email protected]>
Reviewed-by: Lukas Slebodnik <[email protected]>

Author: simo5

proxy/Makefile.am

@@ -23,6 +23,7 @@ localedir = @localedir@
 ccpath = @ccpath@
 initdir = @initdir@
 systemdunitdir = @systemdunitdir@
+examplesdir= @datarootdir@/examples
 logpath = @logpath@
 pubconfpath = @pubconfpath@
 pkgconfigdir = $(libdir)/pkgconfig
@@ -221,11 +222,33 @@ endif
 #######################
 
 dist_init_SCRIPTS =
-dist_systemdunit_DATA =
-if HAVE_SYSTEMD_UNIT
-    dist_systemdunit_DATA += \
-        systemd/gssproxy.service
-endif
+
+edit_cmd = $(SED) \
+    -e 's|@sbindir[@]|$(sbindir)|g' \
+    -e 's|@localstatedir[@]|$(localstatedir)|g' \
+    -e 's|@libdir[@]|$(libdir)|g' \
+    -e 's|@gpstatedir[@]|$(prefix)|g'
+
+replace_script = \
+    @rm -f $@ $@.tmp; \
+    srcdir=''; \
+        test -f ./$@.in || srcdir=$(srcdir)/; \
+        $(edit_cmd) $${srcdir}$@.in >$@.tmp; \
+    mv $@.tmp $@
+
+EXTRA_DIST = \
+    systemd/gssproxy.service.in \
+    examples/gssproxy.conf.in \
+    examples/mech.in
+
+systemd/gssproxy.service: systemd/gssproxy.service.in Makefile
+	$(replace_script)
+
+examples/gssproxy.conf: examples/gssproxy.conf.in Makefile
+	$(replace_script)
+
+examples/mech: examples/mech.in Makefile
+	$(replace_script)
 
 installgsspdirs::
 	mkdir -p \
@@ -257,6 +280,11 @@ 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
 

proxy/configure.ac

@@ -180,7 +180,7 @@ abs_build_dir=`pwd`
 AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the build directory])
 AC_SUBST([abs_builddir], $abs_build_dir)
 
-AC_CONFIG_FILES([Makefile tests/Makefile systemd/gssproxy.service man/Makefile
-                 contrib/gssproxy.spec examples/mech examples/gssproxy.conf
+AC_CONFIG_FILES([Makefile tests/Makefile man/Makefile
+                 contrib/gssproxy.spec
 		 man/gssproxy-mech.8.xml])
 AC_OUTPUT