ehlo, attached patch resolves #2293
LS
>From cecba27b046e7a0dc86ec7485d472f50595c777c Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <lsleb...@redhat.com> Date: Fri, 4 Apr 2014 10:13:44 +0200 Subject: [PATCH] Makefile: Use alternative method to replace *bindir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Installation-Directory-Variables.html Most of these variables have values that rely on prefix or exec_prefix. It is deliberate that the directory output variables keep them unexpanded: typically ‘@sbindir@’ is replaced by ‘${exec_prefix}/sbin’, not ‘/usr/local/sbin’. This behavior is mandated by the GNU Coding Standards. Installation directory variables (sbindir, pkgdatadir ...) should be used only in makefiles. Similarly, we should not rely on AC_CONFIG_FILES to replace sbindir and friends in shell scripts and other files; instead, let make manage their replacement. Resolves: https://fedorahosted.org/sssd/ticket/2293 --- Makefile.am | 27 +++++++++++++++++++++++++++ configure.ac | 1 - 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1731c3aa93570b5ee8647bff3dd00d34a4bd7dd0..066877bd62508ad66aefdc76c04e031d8449fb96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2237,6 +2237,31 @@ dist_sssdapiplugin_DATA = \ src/config/etc/sssd.api.d/sssd-proxy.conf \ src/config/etc/sssd.api.d/sssd-simple.conf +edit_cmd = $(SED) \ + -e 's|@sbindir[@]|$(sbindir)|g' \ + -e 's|@environment_file[@]|$(environment_file)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@prefix[@]|$(prefix)|g' + +replace_script = \ + @rm -f $@ $@.tmp; \ + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(edit_cmd) $${srcdir}$@.in >$@.tmp; \ + mv $@.tmp $@ + +EXTRA_DIST += \ + src/sysv/systemd/sssd.service.in \ + src/sysv/systemd/journal.conf.in + +src/sysv/systemd/sssd.service: src/sysv/systemd/sssd.service.in Makefile + @$(MKDIR_P) src/sysv/systemd/ + $(replace_script) + +src/sysv/systemd/journal.conf: src/sysv/systemd/journal.conf.in Makefile + @$(MKDIR_P) src/sysv/systemd/ + $(replace_script) + installsssddirs:: mkdir -p \ $(DESTDIR)$(includedir) \ @@ -2347,6 +2372,8 @@ endif rm -Rf $$doc; \ done; rm -Rf ldb_mod_test_dir + rm -f $(builddir)/src/sysv/systemd/sssd.service + rm -f $(builddir)/src/sysv/systemd/journal.conf CLEANFILES = *.X */*.X */*/*.X diff --git a/configure.ac b/configure.ac index b4f9221fbc989171005f29567c3aad763cd6d961..b0127f2f9a6e71592c622f43e29b79f91101f985 100644 --- a/configure.ac +++ b/configure.ac @@ -313,7 +313,6 @@ AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the bu AC_SUBST([abs_builddir], $abs_build_dir) AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config - src/sysv/systemd/sssd.service src/sysv/systemd/journal.conf src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd po/Makefile.in src/man/Makefile src/providers/ipa/ipa_hbac.pc src/providers/ipa/ipa_hbac.doxy -- 1.9.0
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/sssd-devel