[Fedora-directory-commits] adminserver Makefile.am, 1.2, 1.3 buildnum.pl, 1.3, 1.4 configure.ac, 1.2, 1.3 configure, 1.2, 1.3 Makefile.in, 1.2, 1.3
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Tue May 15 00:30:50 UTC 2007
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24009/adminserver
Modified Files:
Makefile.am buildnum.pl configure.ac configure Makefile.in
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Added the admin.inf file, which contains information about the brand, product name, vendor, build number, and other information. This gets put in an inf/ subdir of the ds datadir. The update program reads this information and updates the info in the ISIE and SIE entries. This allows us to remove some of the branded code.
2) We need to set the cgisock path for mod_cgid and mod_restartd.
3) The update program needs to modify some http style conf file parameters. The config CGI program already does this. I modified the config CGI program so that it could be run from the command line and modify the parameters that the update program needs.
4) Removed lots of dead code from ux-update.cc. The way it works now is that the config files are generated at build time, not at install time, so a lot of that logic could be removed. We still need to update a few parameters at install time - see 3 above.
5) User can specify configdir, securitydir, logdir, and piddir in the setup.inf file at install time, or can specify environment variables for those, or it will just use the hardcoded values set at build time. This makes it work like the ds instance creation code.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 11 May 2007 19:44:04 -0000 1.2
+++ Makefile.am 15 May 2007 00:30:48 -0000 1.3
@@ -20,10 +20,14 @@
NULLSTRING :=
SPACE := $(NULLSTRING) # the space is between the ) and the #
COLON := $(NULLSTRING):# a colon
+QUOTE := $(NULLSTRING)"# a double quote"
define NL
\\n
endef
+BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
+NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM)))
+
# look for included m4 files in the ./m4/ directory
ACLOCAL_AMFLAGS = -I m4
@@ -68,7 +72,7 @@
configdir = $(instconfigdir)/$(instancename)
# same as configdir for now
securitydir = $(configdir)
-piddir = @piddir@
+piddir = $(localstatedir)@piddir@
pidfile = @pidfile@
logdir = $(localstatedir)@logdir@/$(instancename)
HTTPD = @HTTPD@
@@ -76,6 +80,7 @@
modnssbindir = @modnssbindir@
ldifdir = $(datadir)@ldifdir@
admmoddir = $(libdir)@admmoddir@
+infdir = $(datadir)@infdir@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
@@ -100,7 +105,8 @@
-DCMDBINDIR=\"$(cmdbindir)\" -DMANUALDIR=\"$(manualdir)\" \
-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
-DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
- -DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\"
+ -DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \
+ -DBUILD_NUM=$(BUILDNUM) -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\"
lib_LTLIBRARIES = libds-admin-serv.la
@@ -112,6 +118,8 @@
ldif_DATA = admserv/schema/ldif/admintasks.ldif admserv/schema/ldif/adminglobal.ldif
+inf_DATA = admserv/newinst/src/admin.inf
+
cgibin_PROGRAMS = mergeConfig admpw security ugdsconfig ReadLog start_config_ds \
config statpingserv viewdata dsconfig monreplication restartsrv \
statusping viewlog htmladmin sec-activate stopsrv download help
@@ -288,7 +296,14 @@
-e 's, at admmoddir\@,$(admmoddir),g' \
-e 's, at nssmoddir\@,$(nssmoddir),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
- -e 's, at instancename\@,$(instancename),g'
+ -e 's, at instancename\@,$(instancename),g' \
+ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's, at brand\@,$(brand),g' \
+ -e 's, at capbrand\@,$(capbrand),g' \
+ -e 's, at vendor\@,$(vendor),g' \
+ -e 's, at mimemagic\@,$(mimemagic),g'
% : %.in
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
Index: buildnum.pl
===================================================================
RCS file: /cvs/dirsec/adminserver/buildnum.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildnum.pl 18 Aug 2005 18:57:33 -0000 1.3
+++ buildnum.pl 15 May 2007 00:30:48 -0000 1.4
@@ -40,8 +40,7 @@
if ($opt_H) {exitHelp();}
# Load arguments
-$platdir = $opt_p || exitHelp();
-$buildnum_file = "./$platdir/buildnum.dat";
+$platdir = $opt_p;
# Get current time
@now = gmtime;
@@ -53,10 +52,15 @@
$tod = $now[2] . $now[1];
$buildnum = "$year.$doy.$tod";
-# Write buildnum.dat
-open(BUILDNUM,">$buildnum_file") || die "Error: Can't create $buildnum_file: $!\n";
-print BUILDNUM "\\\"$buildnum\\\"";
-close(BUILDNUM);
+if ($platdir) {
+ # Write buildnum.dat
+ $buildnum_file = "./$platdir/buildnum.dat";
+ open(BUILDNUM,">$buildnum_file") || die "Error: Can't create $buildnum_file: $!\n";
+ print BUILDNUM "\\\"$buildnum\\\"";
+ close(BUILDNUM);
+} else {
+ print "\\\"$buildnum\\\"";
+}
#---------- exitHelp subroutine ----------
sub exitHelp {
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.ac 11 May 2007 19:44:04 -0000 1.2
+++ configure.ac 15 May 2007 00:30:48 -0000 1.3
@@ -61,6 +61,10 @@
# the default prefix - override with --prefix or --with-fhs
AC_PREFIX_DEFAULT([/opt/$PACKAGE_BASE_NAME])
+brand=fedora
+capbrand=Fedora
+vendor="Fedora Project"
+
m4_include(m4/fhs.m4)
# installation paths - by default, configure will just
@@ -118,6 +122,7 @@
icondir=/$PACKAGE_BASE_NAME/icons
manualdir=/$PACKAGE_BASE_NAME/manual
ldifdir=/$PACKAGE_BASE_NAME/data
+infdir=/$PACKAGE_BASE_NAME/inf
# CGI program directory, relative to libdir
cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
@@ -185,6 +190,11 @@
AC_SUBST(ldifdir)
AC_SUBST(admmoddir)
AC_SUBST(nssmoddir)
+AC_SUBST(infdir)
+
+AC_SUBST(brand)
+AC_SUBST(capbrand)
+AC_SUBST(vendor)
# WINNT should be true if building on Windows system not using
# cygnus, mingw, or the like and using cmd.exe as the shell
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 11 May 2007 19:44:04 -0000 1.2
+++ configure 15 May 2007 00:30:48 -0000 1.3
@@ -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 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 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 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_files=''
# Initialize some variables set by options.
@@ -23233,6 +23233,10 @@
# the default prefix - override with --prefix or --with-fhs
+brand=fedora
+capbrand=Fedora
+vendor="Fedora Project"
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -24639,6 +24643,7 @@
icondir=/$PACKAGE_BASE_NAME/icons
manualdir=/$PACKAGE_BASE_NAME/manual
ldifdir=/$PACKAGE_BASE_NAME/data
+infdir=/$PACKAGE_BASE_NAME/inf
# CGI program directory, relative to libdir
cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
@@ -24707,6 +24712,11 @@
+
+
+
+
+
# WINNT should be true if building on Windows system not using
# cygnus, mingw, or the like and using cmd.exe as the shell
@@ -25570,6 +25580,10 @@
s, at ldifdir@,$ldifdir,;t t
s, at admmoddir@,$admmoddir,;t t
s, at nssmoddir@,$nssmoddir,;t t
+s, at infdir@,$infdir,;t t
+s, at brand@,$brand,;t t
+s, at capbrand@,$capbrand,;t t
+s, at vendor@,$vendor,;t t
s, at WINNT_TRUE@,$WINNT_TRUE,;t t
s, at WINNT_FALSE@,$WINNT_FALSE,;t t
s, at APACHE22_TRUE@,$APACHE22_TRUE,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 11 May 2007 19:44:04 -0000 1.2
+++ Makefile.in 15 May 2007 00:30:48 -0000 1.3
@@ -81,8 +81,8 @@
"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cgibindir)" \
"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" \
"$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
- "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
@@ -232,11 +232,13 @@
dist_helpDATA_INSTALL = $(INSTALL_DATA)
dist_htmlDATA_INSTALL = $(INSTALL_DATA)
dist_iconDATA_INSTALL = $(INSTALL_DATA)
+infDATA_INSTALL = $(INSTALL_DATA)
ldifDATA_INSTALL = $(INSTALL_DATA)
nodist_configDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_help_DATA) $(dist_html_DATA) $(dist_icon_DATA) \
- $(ldif_DATA) $(nodist_config_DATA) $(nodist_property_DATA)
+ $(inf_DATA) $(ldif_DATA) $(nodist_config_DATA) \
+ $(nodist_property_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = mod_admserv mod_restartd
@@ -343,11 +345,13 @@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+brand = @brand@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+capbrand = @capbrand@
cgibindir = $(libdir)@cgibindir@
cmdbindir = $(sbindir)
curses_lib = @curses_lib@
@@ -368,6 +372,7 @@
icu_lib = @icu_lib@
icu_libdir = @icu_libdir@
includedir = @includedir@
+infdir = $(datadir)@infdir@
infodir = @infodir@
install_sh = @install_sh@
instancename = @instancename@
@@ -394,7 +399,7 @@
nss_libdir = @nss_libdir@
nssmoddir = @nssmoddir@
oldincludedir = @oldincludedir@
-piddir = @piddir@
+piddir = $(localstatedir)@piddir@
pidfile = @pidfile@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -408,6 +413,7 @@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+vendor = @vendor@
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
@@ -431,6 +437,9 @@
NULLSTRING :=
SPACE := $(NULLSTRING) # the space is between the ) and the #
COLON := $(NULLSTRING):# a colon
+QUOTE := $(NULLSTRING)"# a double quote"
+BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
+NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM)))
# look for included m4 files in the ./m4/ directory
ACLOCAL_AMFLAGS = -I m4
@@ -466,7 +475,8 @@
-DSECURITYDIR=\"$(securitydir)\" -DLOGDIR=\"$(logdir)\" \
-DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
-DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" \
- -DLDIFDIR=\"$(ldifdir)\"
+ -DLDIFDIR=\"$(ldifdir)\" -DBUILD_NUM=$(BUILDNUM) \
+ -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\"
lib_LTLIBRARIES = libds-admin-serv.la
DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ \
@icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
@@ -474,6 +484,7 @@
SETUPUTIL_LIBS = @setuputil_lib@ -ldsinstall
ldif_DATA = admserv/schema/ldif/admintasks.ldif admserv/schema/ldif/adminglobal.ldif
+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
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
@@ -619,7 +630,14 @@
-e 's, at admmoddir\@,$(admmoddir),g' \
-e 's, at nssmoddir\@,$(nssmoddir),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
- -e 's, at instancename\@,$(instancename),g'
+ -e 's, at instancename\@,$(instancename),g' \
+ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's, at brand\@,$(brand),g' \
+ -e 's, at capbrand\@,$(capbrand),g' \
+ -e 's, at vendor\@,$(vendor),g' \
+ -e 's, at mimemagic\@,$(mimemagic),g'
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1315,6 +1333,23 @@
echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
rm -f "$(DESTDIR)$(icondir)/$$f"; \
done
+install-infDATA: $(inf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(infdir)" || $(mkdir_p) "$(DESTDIR)$(infdir)"
+ @list='$(inf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(infDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(infdir)/$$f'"; \
+ $(infDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(infdir)/$$f"; \
+ done
+
+uninstall-infDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(inf_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(infdir)/$$f"; \
+ done
install-ldifDATA: $(ldif_DATA)
@$(NORMAL_INSTALL)
test -z "$(ldifdir)" || $(mkdir_p) "$(DESTDIR)$(ldifdir)"
@@ -1647,7 +1682,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)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"; do \
+ 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 \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -1709,9 +1744,9 @@
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
install-cmdbinPROGRAMS install-dist_helpDATA \
- install-dist_htmlDATA install-dist_iconDATA install-ldifDATA \
- install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA
+ install-dist_htmlDATA install-dist_iconDATA install-infDATA \
+ install-ldifDATA install-nodist_cmdbinSCRIPTS \
+ install-nodist_configDATA install-nodist_propertyDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1746,9 +1781,9 @@
uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
uninstall-cmdbinPROGRAMS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
- uninstall-info-am uninstall-ldifDATA uninstall-libLTLIBRARIES \
- uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
- uninstall-nodist_propertyDATA
+ uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
+ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+ uninstall-nodist_configDATA uninstall-nodist_propertyDATA
uninstall-info: uninstall-info-recursive
@@ -1764,8 +1799,8 @@
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-info install-info-am install-ldifDATA \
- install-libLTLIBRARIES install-man \
+ 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 \
installcheck-am installdirs installdirs-am maintainer-clean \
@@ -1776,9 +1811,9 @@
uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
uninstall-cmdbinPROGRAMS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
- uninstall-info-am uninstall-ldifDATA uninstall-libLTLIBRARIES \
- uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
- uninstall-nodist_propertyDATA
+ uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
+ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+ uninstall-nodist_configDATA uninstall-nodist_propertyDATA
define NL
\\n
More information about the Fedora-directory-commits
mailing list