diff options
| author | Simo Sorce <simo@redhat.com> | 2015-01-09 14:56:44 -0500 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2015-03-21 14:30:37 -0400 |
| commit | 7c6892cd059cba881e8d24e486fdc214fc5a87aa (patch) | |
| tree | 19075a119023e6a99cc92ebffe17f52c1fe28327 | |
| parent | c3c370a7e95987ec55b3441e6ff5fcd218ff5bb0 (diff) | |
| download | gss-proxy-7c6892cd059cba881e8d24e486fdc214fc5a87aa.tar.gz gss-proxy-7c6892cd059cba881e8d24e486fdc214fc5a87aa.tar.xz gss-proxy-7c6892cd059cba881e8d24e486fdc214fc5a87aa.zip | |
Fix variable replacement in non config files
Fixes: #132
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rw-r--r-- | proxy/Makefile.am | 32 | ||||
| -rw-r--r-- | proxy/configure.ac | 4 |
2 files changed, 34 insertions, 2 deletions
diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 4ba129d..63cada6 100644 --- a/proxy/Makefile.am +++ b/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 @@ -226,6 +227,37 @@ if HAVE_SYSTEMD_UNIT dist_systemdunit_DATA += \ systemd/gssproxy.service endif +dist_examples_DATA = examples/mech examples/gssproxy.conf + +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 + @$(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:: mkdir -p \ diff --git a/proxy/configure.ac b/proxy/configure.ac index 5e43c3b..5197976 100644 --- a/proxy/configure.ac +++ b/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 |