From 42dd8e08a593680f53fb359894f7da83f886446d Mon Sep 17 00:00:00 2001
From: Matus Honek <mhonek@redhat.com>
Date: Thu, 6 Jun 2019 07:15:25 +0000
Subject: [PATCH] Drop *-initconfig files in case of SystemD

---
 Makefile.am | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c64eabb6c..6f2fd5eca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -654,8 +654,10 @@ endif
 #------------------------
 config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
 	$(srcdir)/ldap/schema/slapd-collations.conf \
-	ldap/admin/src/template-initconfig \
 	ldap/servers/snmp/ldap-agent.conf
+if !SYSTEMD
+config_DATA += ldap/admin/src/template-initconfig
+endif
 
 # the schema files in this list are either not
 # standard schema, not tested, or not compatible
@@ -983,12 +985,14 @@ dist_man_MANS = man/man1/dbscan.1 \
         man/man5/slapd-collations.conf.5 \
         man/man8/suffix2instance.8 \
         man/man8/syntax-validate.pl.8 \
-        man/man5/template-initconfig.5 \
         man/man8/upgradednformat.8 \
         man/man8/upgradedb.8 \
         man/man8/usn-tombstone-cleanup.pl.8 \
         man/man8/vlvindex.8 \
         man/man8/verify-db.pl.8
+if !SYSTEMD
+dist_man_MANS += man/man5/template-initconfig.5
+endif
 
 #------------------------
 # updates
@@ -2294,20 +2298,14 @@ fixupcmd = sed \
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
 
+if !SYSTEMD
 %/$(PACKAGE_NAME): %/base-initconfig.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
-if SYSTEMD
-	$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
-else
 	$(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e '/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
 	$(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@
-endif
 
 %/template-initconfig: %/template-initconfig.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
-if SYSTEMD
-	$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@
-else
 	$(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e '/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
 endif
 
-- 
2.21.0