[Fedora-directory-commits] adminserver Makefile.am, 1.6, 1.7 configure.ac, 1.4, 1.5 aclocal.m4, 1.4, 1.5 configure, 1.5, 1.6 missing, 1.3, 1.4 install-sh, 1.3, 1.4 depcomp, 1.3, 1.4 config.sub, 1.3, 1.4 config.guess, 1.3, 1.4 compile, 1.3, 1.4 Makefile.in, 1.6, 1.7

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Jun 8 22:49:20 UTC 2007 

Author: rmeggins

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

Modified Files:
	Makefile.am configure.ac aclocal.m4 configure missing 
	install-sh depcomp config.sub config.guess compile Makefile.in 
Log Message:
Resolves: bug 237356
Bug Description: Move DS Admin Code into Admin Server
Reviewed by: nkinder (Thanks!)
Fix Description: This adds the admin server specific setup "ui" and main script driver.  Some of the values are currently missing because they don't yet have ui support.  These are commented out in setup-ds-admin.pl.  But at least this gives us the framework to add support for config DS creation, server registration, and other post config stuff.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes, along with the rest of the new setup stuff.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	21 May 2007 15:52:25 -0000	1.6
+++ Makefile.am	8 Jun 2007 22:49:18 -0000	1.7
@@ -81,6 +81,7 @@
 ldifdir = $(datadir)@ldifdir@
 admmoddir = $(libdir)@admmoddir@
 infdir = $(datadir)@infdir@
+perldir = $(libdir)@perldir@
 
 libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
 	lib/base/system.cpp lib/base/nscputil.cpp
@@ -127,8 +128,12 @@
 cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
 nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
 
+cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl
+
 cmdbin_PROGRAMS = ds-admin-config ds-admin-remove ds-admin-update  
 
+perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm
+
 libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
 
 # source files for our CGI programs
@@ -244,8 +249,10 @@
 	admserv/cgi-src40/viewlog_root.res
 
 MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
-# property file installation is handled specially
+# ICU resource file installation is handled specially
 nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
+# regular property files go here
+property_DATA = admserv/newinst/src/setup-ds-admin.res
 
 # French resource bundles (for the French localization in the future)
 #RESOURCE_BUNDLES_FR = foo_fr.res
@@ -270,6 +277,7 @@
 # ADMConfigDir = /etc/packagename
 fixupcmd = sed \
 	-e 's, at HTTPD\@,$(HTTPD),g' \
+	-e 's, at bindir\@,$(bindir),g' \
 	-e 's, at cgibindir\@,$(cgibindir),g' \
 	-e 's, at cmdbindir\@,$(cmdbindir),g' \
 	-e 's, at moddir\@,$(moddir),g' \
@@ -303,7 +311,8 @@
 	-e 's, at brand\@,$(brand),g' \
 	-e 's, at capbrand\@,$(capbrand),g' \
 	-e 's, at vendor\@,$(vendor),g' \
-	-e 's, at mimemagic\@,$(mimemagic),g'
+	-e 's, at mimemagic\@,$(mimemagic),g' \
+	-e 's, at perldir\@,$(perldir),g'
 
 # because the source may be either httpd.conf.in or httpd-2.2.conf.in
 admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	21 May 2007 15:52:25 -0000	1.4
+++ configure.ac	8 Jun 2007 22:49:18 -0000	1.5
@@ -142,6 +142,9 @@
 # relative to libdir
 admmoddir=/$PACKAGE_BASE_NAME/modules
 
+# relative to libdir
+perldir=/$PACKAGE_BASE_NAME/perl
+
 # write out paths for binary components
 AC_SUBST(PACKAGE_BASE_NAME)
 AC_SUBST(nspr_inc)
@@ -191,6 +194,7 @@
 AC_SUBST(admmoddir)
 AC_SUBST(nssmoddir)
 AC_SUBST(infdir)
+AC_SUBST(perldir)
 
 AC_SUBST(brand)
 AC_SUBST(capbrand)




Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure	21 May 2007 15:52:25 -0000	1.5
+++ configure	8 Jun 2007 22:49:18 -0000	1.6
@@ -468,7 +468,7 @@
 ac_default_prefix=/opt/$PACKAGE_BASE_NAME
 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 HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir 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 HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir 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.
@@ -24736,6 +24736,9 @@
 # relative to libdir
 admmoddir=/$PACKAGE_BASE_NAME/modules
 
+# relative to libdir
+perldir=/$PACKAGE_BASE_NAME/perl
+
 # write out paths for binary components
 
 
@@ -24790,6 +24793,7 @@
 
 
 
+
 # WINNT should be true if building on Windows system not using
 # cygnus, mingw, or the like and using cmd.exe as the shell
 
@@ -25655,6 +25659,7 @@
 s, at admmoddir@,$admmoddir,;t t
 s, at nssmoddir@,$nssmoddir,;t t
 s, at infdir@,$infdir,;t t
+s, at perldir@,$perldir,;t t
 s, at brand@,$brand,;t t
 s, at capbrand@,$capbrand,;t t
 s, at vendor@,$vendor,;t t














Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in	21 May 2007 15:52:25 -0000	1.6
+++ Makefile.in	8 Jun 2007 22:49:18 -0000	1.7
@@ -79,10 +79,12 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
 	"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cgibindir)" \
-	"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" \
+	"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cmdbindir)" \
+	"$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \
 	"$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
 	"$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"
+	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+	"$(DESTDIR)$(propertydir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libds_admin_serv_la_LIBADD =
@@ -182,8 +184,11 @@
 viewlog_OBJECTS = $(am_viewlog_OBJECTS)
 viewlog_DEPENDENCIES = $(am__DEPENDENCIES_1)
 cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(cgibin_SCRIPTS) $(nodist_cmdbin_SCRIPTS)
+perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(nodist_cmdbin_SCRIPTS) \
+	$(perl_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -236,9 +241,10 @@
 ldifDATA_INSTALL = $(INSTALL_DATA)
 nodist_configDATA_INSTALL = $(INSTALL_DATA)
 nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
+propertyDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_help_DATA) $(dist_html_DATA) $(dist_icon_DATA) \
 	$(inf_DATA) $(ldif_DATA) $(nodist_config_DATA) \
-	$(nodist_property_DATA)
+	$(nodist_property_DATA) $(property_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = mod_admserv mod_restartd
@@ -400,6 +406,7 @@
 nssmoddir = @nssmoddir@
 nsspcache = @nsspcache@
 oldincludedir = @oldincludedir@
+perldir = $(libdir)@perldir@
 piddir = $(localstatedir)@piddir@
 pidfile = @pidfile@
 prefix = @prefix@
@@ -488,6 +495,8 @@
 inf_DATA = admserv/newinst/src/admin.inf
 cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
 nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
+cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl
+perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm
 libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
 
 # source files for our CGI programs
@@ -594,8 +603,10 @@
 	admserv/cgi-src40/sec-activate_root.res \
 	admserv/cgi-src40/viewlog_root.res
 
-# property file installation is handled specially
+# ICU resource file installation is handled specially
 nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
+# regular property files go here
+property_DATA = admserv/newinst/src/setup-ds-admin.res
 
 # these are for the config files and scripts that we need to generate and replace
 # the paths and other tokens with the real values set during configure/make
@@ -605,6 +616,7 @@
 # ADMConfigDir = /etc/packagename
 fixupcmd = sed \
 	-e 's, at HTTPD\@,$(HTTPD),g' \
+	-e 's, at bindir\@,$(bindir),g' \
 	-e 's, at cgibindir\@,$(cgibindir),g' \
 	-e 's, at cmdbindir\@,$(cmdbindir),g' \
 	-e 's, at moddir\@,$(moddir),g' \
@@ -638,7 +650,8 @@
 	-e 's, at brand\@,$(brand),g' \
 	-e 's, at capbrand\@,$(capbrand),g' \
 	-e 's, at vendor\@,$(vendor),g' \
-	-e 's, at mimemagic\@,$(mimemagic),g'
+	-e 's, at mimemagic\@,$(mimemagic),g' \
+	-e 's, at perldir\@,$(perldir),g'
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -999,6 +1012,25 @@
 	  echo " rm -f '$(DESTDIR)$(cgibindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(cgibindir)/$$f"; \
 	done
+install-cmdbinSCRIPTS: $(cmdbin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
+	@list='$(cmdbin_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 " $(cmdbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(cmdbindir)/$$f'"; \
+	    $(cmdbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(cmdbindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-cmdbinSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(cmdbin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \
+	done
 install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
@@ -1018,6 +1050,25 @@
 	  echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \
 	done
+install-perlSCRIPTS: $(perl_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)"
+	@list='$(perl_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 " $(perlSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \
+	    $(perlSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-perlSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(perl_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(perldir)/$$f"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1402,6 +1453,23 @@
 	  echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(propertydir)/$$f"; \
 	done
+install-propertyDATA: $(property_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
+	@list='$(property_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(propertyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(propertydir)/$$f'"; \
+	  $(propertyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(propertydir)/$$f"; \
+	done
+
+uninstall-propertyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(property_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(propertydir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1683,7 +1751,7 @@
 		config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(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
@@ -1744,10 +1812,12 @@
 info-am:
 
 install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
-	install-cmdbinPROGRAMS install-dist_helpDATA \
-	install-dist_htmlDATA install-dist_iconDATA install-infDATA \
-	install-ldifDATA install-nodist_cmdbinSCRIPTS \
-	install-nodist_configDATA install-nodist_propertyDATA
+	install-cmdbinPROGRAMS install-cmdbinSCRIPTS \
+	install-dist_helpDATA install-dist_htmlDATA \
+	install-dist_iconDATA install-infDATA install-ldifDATA \
+	install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
+	install-nodist_propertyDATA install-perlSCRIPTS \
+	install-propertyDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
@@ -1780,11 +1850,13 @@
 ps-am:
 
 uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
-	uninstall-cmdbinPROGRAMS uninstall-dist_helpDATA \
-	uninstall-dist_htmlDATA uninstall-dist_iconDATA \
-	uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
-	uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
-	uninstall-nodist_configDATA uninstall-nodist_propertyDATA
+	uninstall-cmdbinPROGRAMS uninstall-cmdbinSCRIPTS \
+	uninstall-dist_helpDATA uninstall-dist_htmlDATA \
+	uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \
+	uninstall-ldifDATA uninstall-libLTLIBRARIES \
+	uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+	uninstall-propertyDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -1797,24 +1869,28 @@
 	distclean-libtool distclean-recursive distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-cgibinPROGRAMS \
-	install-cgibinSCRIPTS install-cmdbinPROGRAMS install-data \
-	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-ldifDATA install-libLTLIBRARIES install-man \
+	install-cgibinSCRIPTS install-cmdbinPROGRAMS \
+	install-cmdbinSCRIPTS install-data 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-ldifDATA \
+	install-libLTLIBRARIES install-man \
 	install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
-	install-nodist_propertyDATA install-strip installcheck \
+	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-cmdbinPROGRAMS uninstall-dist_helpDATA \
-	uninstall-dist_htmlDATA uninstall-dist_iconDATA \
-	uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
-	uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
-	uninstall-nodist_configDATA uninstall-nodist_propertyDATA
+	uninstall-cmdbinPROGRAMS uninstall-cmdbinSCRIPTS \
+	uninstall-dist_helpDATA uninstall-dist_htmlDATA \
+	uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \
+	uninstall-ldifDATA uninstall-libLTLIBRARIES \
+	uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+	uninstall-propertyDATA
 
 define NL
 \\n

More information about the Fedora-directory-commits mailing list