| |
@@ -654,10 +654,8 @@
|
| |
#------------------------
|
| |
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
|
| |
@@ -987,14 +985,12 @@
|
| |
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
|
| |
@@ -2298,14 +2294,20 @@
|
| |
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
|
| |
|
| |
The previous fix (7466be3) for jemalloc inclusion stopped installing
template-initconfig rendering ds-setup.pl unusable.
This fix moves the template-initconfig into -legacy-tools
to make it available only when necessary.
Relates: https://pagure.io/389-ds-base/issue/50425
Reviewed by: ???