[Fedora-directory-commits] adminserver Makefile.am, 1.33, 1.34 configure.ac, 1.21, 1.22 aclocal.m4, 1.32, 1.33 configure, 1.36, 1.37 missing, 1.22, 1.23 install-sh, 1.22, 1.23 depcomp, 1.22, 1.23 compile, 1.21, 1.22 Makefile.in, 1.39, 1.40 config.sub, 1.22, 1.23 config.guess, 1.22, 1.23

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29402/adminserver

Modified Files:
	Makefile.am configure.ac aclocal.m4 configure missing 
	install-sh depcomp compile Makefile.in config.sub config.guess 
Log Message:
Resolves: bug 248169
Bug Description: init script modification needed for kerberos auth
Reviewed by: nhosoi (Thanks!)
Fix Description: I just took Simo's initial patch and ran with it.  The initconfigdir
parameter is the directory containing the config file for the init script.  configure will
first try to use $(sysconfdir)/sysconfig, then $(sysconfdir)/default (Solaris and Debian,
among others), then the package config directory (the default on HP-UX), for this
parameter.  The init script and startup script will look in the initconfigdir to find the
init config file to source.  For directory server, an instance specific file can be used,
named e.g. dirsrv-localhost which will apply to the slapd-localhost instance only.
A default init config file is provided for dirsrv and dirsrv-admin, with some examples of
how it could be used.
Platforms tested: RHEL5 x86_64
Flag Day: Yes - autotool file changes
Doc impact: Yes.  We will need to document how the user can supply environment to the
servers at startup time without having to edit the init scripts or the startup scripts.
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none 



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.am	5 Sep 2007 16:45:58 -0000	1.33
+++ Makefile.am	5 Oct 2007 23:48:01 -0000	1.34
@@ -68,6 +68,7 @@
 manualdir = $(datadir)@manualdir@
 helpdir = $(manualdir)/help
 initdir = $(sysconfdir)@initdir@
+initconfigdir = $(sysconfdir)@initconfigdir@
 instconfigdir = @instconfigdir@
 instancename = @instancename@
 configdir = $(instconfigdir)/$(instancename)
@@ -146,6 +147,8 @@
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
 
+initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+
 ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
 	admserv/schema/ldif/01nsroot.ldif.tmpl \
 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -490,7 +493,8 @@
         -e 's,@infdir\@,$(infdir),g' \
         -e 's,@dslibdir\@,$(dslibdir),g' \
         -e 's,@ldifdir\@,$(ldifdir),g' \
-        -e 's,@adminutilpath\@,$(adminutilpath),g'
+        -e 's,@adminutilpath\@,$(adminutilpath),g' \
+        -e 's,@initconfigdir\@,$(initconfigdir),g'
 else
 fixupcmd = sed \
 	-e 's,@ECHO_C\@,$(ECHO_C),g' \
@@ -540,7 +544,8 @@
 	-e 's,@infdir\@,$(infdir),g' \
 	-e 's,@dslibdir\@,$(dslibdir),g' \
 	-e 's,@ldifdir\@,$(ldifdir),g' \
-	-e 's,@adminutilpath\@,$(adminutilpath),g'
+	-e 's,@adminutilpath\@,$(adminutilpath),g' \
+	-e 's,@initconfigdir\@,$(initconfigdir),g'
 endif
 
 # because the source may be either httpd.conf.in or httpd-2.2.conf.in
@@ -555,3 +560,7 @@
 %/$(PACKAGE_NAME): %/initscript.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initconfig.in
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(fixupcmd) $^ > $@


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.ac	27 Sep 2007 16:57:08 -0000	1.21
+++ configure.ac	5 Oct 2007 23:48:01 -0000	1.22
@@ -141,6 +141,7 @@
     CXXLINK_REQUIRED=1
     httpdgroup=nogroup
     platform="hpux"
+    initconfigdir="/$PACKAGE_NAME/config"
 	;;
   hppa*-hp-hpux*)
     AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -157,6 +158,7 @@
     # assume 64 bit
     perlexec='/opt/perl_64/bin/perl'
     platform="hpux"
+    initconfigdir="/$PACKAGE_NAME/config"
 	;;
   sparc-sun-solaris*)
     AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -194,6 +196,19 @@
 AM_CONDITIONAL([HPUX],test "$platform" = "hpux")
 AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris")
 
+# set default initconfigdir if not already set
+# value will be set so as to be relative to $(sysconfdir)
+if test -z "$initconfigdir" ; then
+   if test -d /etc/sysconfig ; then
+      initconfigdir=/sysconfig
+   elif test -d /etc/default ; then
+      initconfigdir=/default
+   else
+      initconfigdir="/$PACKAGE_NAME/config"
+   fi
+fi
+AC_SUBST(initconfigdir)
+
 # Check for fortitude
 m4_include(m4/fortitude.m4)
 # Check for web server




Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- configure	27 Sep 2007 16:57:08 -0000	1.36
+++ configure	5 Oct 2007 23:48:01 -0000	1.37
@@ -468,7 +468,7 @@
 ac_default_prefix=/opt/dirsrv
 ac_subdirs_all="$ac_subdirs_all mod_admserv"
 ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir
ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir
adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir
modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic
httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir nssmoddir
infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE
subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE
LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache
instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc
sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib
adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir
cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir
mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir
nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE
APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE
MOD_RESTARTD_FALSE LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -23117,6 +23117,7 @@
     CXXLINK_REQUIRED=1
     httpdgroup=nogroup
     platform="hpux"
+    initconfigdir="/$PACKAGE_NAME/config"
 	;;
   hppa*-hp-hpux*)
 
@@ -23169,6 +23170,7 @@
     # assume 64 bit
     perlexec='/opt/perl_64/bin/perl'
     platform="hpux"
+    initconfigdir="/$PACKAGE_NAME/config"
 	;;
   sparc-sun-solaris*)
 
@@ -23275,6 +23277,19 @@
 fi
 
 
+# set default initconfigdir if not already set
+# value will be set so as to be relative to $(sysconfdir)
+if test -z "$initconfigdir" ; then
+   if test -d /etc/sysconfig ; then
+      initconfigdir=/sysconfig
+   elif test -d /etc/default ; then
+      initconfigdir=/default
+   else
+      initconfigdir="/$PACKAGE_NAME/config"
+   fi
+fi
+
+
 # Check for fortitude
 # BEGIN COPYRIGHT BLOCK
 # Copyright (C) 2007 Red Hat, Inc.
@@ -25940,6 +25955,7 @@
 s,@HPUX_FALSE@,$HPUX_FALSE,;t t
 s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
 s,@SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
+s,@initconfigdir@,$initconfigdir,;t t
 s,@HTTPD@,$HTTPD,;t t
 s,@APXS@,$APXS,;t t
 s,@APR_CONFIG@,$APR_CONFIG,;t t










Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.in	27 Sep 2007 16:57:08 -0000	1.39
+++ Makefile.in	5 Oct 2007 23:48:02 -0000	1.40
@@ -100,12 +100,12 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
 	"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
-	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
-	"$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \
-	"$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
-	"$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
-	"$(DESTDIR)$(propertydir)"
+	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
+	"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
+	"$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
+	"$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
+	"$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
+	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libds_admin_serv_la_LIBADD =
@@ -241,10 +241,11 @@
 cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \
-	$(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+	$(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -461,6 +462,7 @@
 includedir = @includedir@
 infdir = $(datadir)@infdir@
 infodir = @infodir@
+initconfigdir = $(sysconfdir)@initconfigdir@
 initdir = $(sysconfdir)@initdir@
 install_sh = @install_sh@
 instancename = @instancename@
@@ -585,6 +587,7 @@
 @CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
 @CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
 ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
 	admserv/schema/ldif/01nsroot.ldif.tmpl \
 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -875,7 +878,8 @@
 @BUNDLE_FALSE@	-e 's,@infdir\@,$(infdir),g' \
 @BUNDLE_FALSE@	-e 's,@dslibdir\@,$(dslibdir),g' \
 @BUNDLE_FALSE@	-e 's,@ldifdir\@,$(ldifdir),g' \
-@BUNDLE_FALSE@	-e 's,@adminutilpath\@,$(adminutilpath),g'
+@BUNDLE_FALSE@	-e 's,@adminutilpath\@,$(adminutilpath),g' \
+@BUNDLE_FALSE@	-e 's,@initconfigdir\@,$(initconfigdir),g'
 
 
 # these are for the config files and scripts that we need to generate and replace
@@ -934,7 +938,8 @@
 @BUNDLE_TRUE@        -e 's,@infdir\@,$(infdir),g' \
 @BUNDLE_TRUE@        -e 's,@dslibdir\@,$(dslibdir),g' \
 @BUNDLE_TRUE@        -e 's,@ldifdir\@,$(ldifdir),g' \
-@BUNDLE_TRUE@        -e 's,@adminutilpath\@,$(adminutilpath),g'
+@BUNDLE_TRUE@        -e 's,@adminutilpath\@,$(adminutilpath),g' \
+@BUNDLE_TRUE@        -e 's,@initconfigdir\@,$(initconfigdir),g'
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1429,6 +1434,25 @@
 	  echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(initdir)/$$f"; \
 	done
+install-initconfigSCRIPTS: $(initconfig_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(initconfigdir)" || $(mkdir_p)
"$(DESTDIR)$(initconfigdir)"
+	@list='$(initconfig_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(initconfigSCRIPT_INSTALL) '$$d$$p'
'$(DESTDIR)$(initconfigdir)/$$f'"; \
+	    $(initconfigSCRIPT_INSTALL) "$$d$$p"
"$(DESTDIR)$(initconfigdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-initconfigSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(initconfig_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \
+	done
 install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
@@ -2621,7 +2645,7 @@
 		$(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)"
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)"
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)"
"$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)"
"$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)"
"$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)"
"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"
"$(DESTDIR)$(propertydir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)"
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)"
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)"
"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)"
"$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)"
"$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)"
"$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)"
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -2686,7 +2710,7 @@
 install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
 	install-cmdbinSCRIPTS install-dist_helpDATA \
 	install-dist_htmlDATA install-dist_iconDATA install-infDATA \
-	install-initSCRIPTS install-ldifDATA \
+	install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
 	install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
 	install-nodist_propertyDATA install-perlSCRIPTS \
 	install-propertyDATA
@@ -2725,10 +2749,10 @@
 	uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
 	uninstall-dist_htmlDATA uninstall-dist_iconDATA \
 	uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
-	uninstall-ldifDATA uninstall-libLTLIBRARIES \
-	uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
-	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
-	uninstall-propertyDATA
+	uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+	uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+	uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
+	uninstall-perlSCRIPTS uninstall-propertyDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -2745,23 +2769,24 @@
 	install-data-am install-data-hook install-dist_helpDATA \
 	install-dist_htmlDATA install-dist_iconDATA install-exec \
 	install-exec-am install-infDATA install-info install-info-am \
-	install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \
-	install-man install-nodist_cmdbinSCRIPTS \
-	install-nodist_configDATA install-nodist_propertyDATA \
-	install-perlSCRIPTS install-propertyDATA install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
+	install-libLTLIBRARIES install-man \
+	install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
+	install-nodist_propertyDATA install-perlSCRIPTS \
+	install-propertyDATA install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
 	uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
 	uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
 	uninstall-dist_htmlDATA uninstall-dist_iconDATA \
 	uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
-	uninstall-ldifDATA uninstall-libLTLIBRARIES \
-	uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
-	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
-	uninstall-propertyDATA
+	uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+	uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+	uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
+	uninstall-perlSCRIPTS uninstall-propertyDATA
 
 define NL
 \\n
@@ -2806,6 +2831,10 @@
 %/$(PACKAGE_NAME): %/initscript.in
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initconfig.in
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(fixupcmd) $^ > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: