Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/ldapserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 237356
Description: Move DS Admin Code into Admin Server
Fix Description: This adds the setup related perl modules, scripts, and resource files to
the DS base code. This will allow a user to interactively setup (create an instance of) a
directory server. This will also form the base of the work to add the console and admin
server related setup code.
New files/directories:
$libdir/fedora-ds/perl - this is where the perl modules (Setup.pm, etc.) will be
installed.
$bindir/setup-ds.pl - the script to use to interactively create an instance of directory
server. This has use lib '$libdir/fedora-ds/perl' hard coded into it at build
time, in order to find the "private" setup perl modules. If you invoke this
script in silent mode (setup-ds.pl -s) then it is exactly the same as just using
ds_newinst.pl.
$sysconfdir/fedora-ds/property/setup-ds.res - Resources for setup-ds.pl and the associated
modules.
I also fixed a problem with the libns-dshttpd linkage.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes. All of these new items will need to be documented.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.am 16 May 2007 19:45:26 -0000 1.39
+++ Makefile.am 8 Jun 2007 01:09:14 -0000 1.40
@@ -74,6 +74,7 @@
taskdir = $(datadir)@scripttemplatedir@
initdir = $(sysconfdir)@initdir@
instconfigdir = @instconfigdir@
+perldir = $(libdir)@perldir@
#------------------------
# Build Products
@@ -167,7 +168,21 @@
wrappers/cl-dump \
ldap/admin/src/scripts/cl-dump.pl \
wrappers/repl-monitor \
- ldap/admin/src/scripts/repl-monitor.pl
+ ldap/admin/src/scripts/repl-monitor.pl \
+ ldap/admin/src/scripts/setup-ds.pl
+
+perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \
+ ldap/admin/src/scripts/Resource.pm \
+ ldap/admin/src/scripts/Util.pm \
+ ldap/admin/src/scripts/Setup.pm \
+ ldap/admin/src/scripts/SetupDialogs.pm \
+ ldap/admin/src/scripts/Inf.pm \
+ ldap/admin/src/scripts/DialogManager.pm \
+ ldap/admin/src/scripts/Dialog.pm \
+ ldap/admin/src/scripts/DSDialogs.pm \
+ ldap/admin/src/scripts/Setup.pm
+
+property_DATA = ldap/admin/src/scripts/setup-ds.res
task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2bak \
@@ -327,7 +342,7 @@
$(libldaputil_a_SOURCES)
libns_dshttpd_la_CPPFLAGS = -I$(srcdir)/include/base $(AM_CPPFLAGS)
-I$(srcdir)/lib/ldaputil @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
+libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
#------------------------
# libslapd
@@ -997,7 +1012,11 @@
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
-e 's,@instconfigdir\@,$(instconfigdir),g' \
-e 's,@ECHO_N\@,$(ECHO_N),g' \
- -e 's,@ECHO_C\@,$(ECHO_C),g'
+ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+ -e 's,@brand\@,$(brand),g' \
+ -e 's,@capbrand\@,$(capbrand),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@perldir\@,$(perldir),g'
else
fixupcmd = sed \
-e 's,@bindir\@,$(bindir),g' \
@@ -1023,7 +1042,11 @@
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
-e 's,@instconfigdir\@,$(instconfigdir),g' \
-e 's,@ECHO_N\@,$(ECHO_N),g' \
- -e 's,@ECHO_C\@,$(ECHO_C),g'
+ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+ -e 's,@brand\@,$(brand),g' \
+ -e 's,@capbrand\@,$(capbrand),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@perldir\@,$(perldir),g'
endif
%: %.in
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- configure.ac 16 May 2007 19:45:26 -0000 1.28
+++ configure.ac 8 Jun 2007 01:09:15 -0000 1.29
@@ -139,6 +139,10 @@
# the default prefix - override with --prefix or --with-fhs
AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
+brand=fedora
+capbrand=Fedora
+vendor="Fedora Project"
+
m4_include(m4/fhs.m4)
# installation paths - by default, we store everything
@@ -186,6 +190,8 @@
propertydir=/$PACKAGE_NAME/property
# relative to sysconfdir
schemadir=/$PACKAGE_NAME/schema
+# relative to libdir
+perldir=/$PACKAGE_NAME/perl
AC_SUBST(configdir)
AC_SUBST(sampledatadir)
@@ -194,6 +200,7 @@
AC_SUBST(serverdir)
AC_SUBST(serverplugindir)
AC_SUBST(scripttemplatedir)
+AC_SUBST(perldir)
# check for --with-instconfigdir
AC_MSG_CHECKING(for --with-instconfigdir)
@@ -332,6 +339,10 @@
AC_SUBST(netsnmp_libdir)
AC_SUBST(netsnmp_link)
+AC_SUBST(brand)
+AC_SUBST(capbrand)
+AC_SUBST(vendor)
+
AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- configure 16 May 2007 19:45:26 -0000 1.42
+++ configure 8 Jun 2007 01:09:15 -0000 1.43
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-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 debug_defs BUNDLE_TRUE BUNDLE_FALSE
enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE
enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE configdir
sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir
instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir
HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib
ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver
sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc
netsnmp_lib netsnmp_libdir netsnmp_link 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 debug_defs BUNDLE_TRUE BUNDLE_FALSE
enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE
enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE configdir
sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir
instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir
HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib
ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver
sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc
netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23054,6 +23054,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.
@@ -23177,6 +23181,9 @@
propertydir=/$PACKAGE_NAME/property
# relative to sysconfdir
schemadir=/$PACKAGE_NAME/schema
+# relative to libdir
+perldir=/$PACKAGE_NAME/perl
+
@@ -25147,6 +25154,10 @@
+
+
+
+
cat >>confdefs.h <<\_ACEOF
#define LDAP_DEBUG 1
_ACEOF
@@ -25978,6 +25989,7 @@
s,@serverdir@,$serverdir,;t t
s,@serverplugindir@,$serverplugindir,;t t
s,@scripttemplatedir@,$scripttemplatedir,;t t
+s,@perldir@,$perldir,;t t
s,@instconfigdir@,$instconfigdir,;t t
s,@WINNT_TRUE@,$WINNT_TRUE,;t t
s,@WINNT_FALSE@,$WINNT_FALSE,;t t
@@ -26022,6 +26034,9 @@
s,@netsnmp_lib@,$netsnmp_lib,;t t
s,@netsnmp_libdir@,$netsnmp_libdir,;t t
s,@netsnmp_link@,$netsnmp_link,;t t
+s,@brand@,$brand,;t t
+s,@capbrand@,$capbrand,;t t
+s,@vendor@,$vendor,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.in 16 May 2007 19:45:26 -0000 1.46
+++ Makefile.in 8 Jun 2007 01:09:15 -0000 1.47
@@ -94,8 +94,9 @@
am__installdirs = "$(DESTDIR)$(serverdir)" \
"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(initdir)" "$(DESTDIR)$(taskdir)" \
- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" \
+ "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
+ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
"$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
@@ -268,7 +269,8 @@
libhttp_client_plugin_la_OBJECTS = \
$(am_libhttp_client_plugin_la_OBJECTS)
libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am__objects_1 = lib/ldaputil/libns_dshttpd_la-cert.lo \
lib/ldaputil/libns_dshttpd_la-certmap.lo \
lib/ldaputil/libns_dshttpd_la-dbconf.lo \
@@ -711,8 +713,10 @@
$(am__DEPENDENCIES_1)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(task_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(perl_SCRIPTS) \
+ $(task_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -786,10 +790,11 @@
$(rsearch_bin_SOURCES)
configDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
+propertyDATA_INSTALL = $(INSTALL_DATA)
sampledataDATA_INSTALL = $(INSTALL_DATA)
schemaDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(config_DATA) $(nodist_property_DATA) $(sampledata_DATA) \
- $(schema_DATA)
+DATA = $(config_DATA) $(nodist_property_DATA) $(property_DATA) \
+ $(sampledata_DATA) $(schema_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -892,11 +897,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@
#------------------------
# Install Paths
@@ -952,6 +959,7 @@
nss_lib = @nss_lib@
nss_libdir = @nss_libdir@
oldincludedir = @oldincludedir@
+perldir = $(libdir)@perldir@
prefix = @prefix@
program_transform_name = @program_transform_name@
propertydir = $(sysconfdir)@propertydir@
@@ -969,6 +977,7 @@
svrcore_lib = @svrcore_lib@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+vendor = @vendor@
# look for included m4 files in the ./m4/ directory
ACLOCAL_AMFLAGS = -I m4
@@ -1092,8 +1101,21 @@
wrappers/cl-dump \
ldap/admin/src/scripts/cl-dump.pl \
wrappers/repl-monitor \
- ldap/admin/src/scripts/repl-monitor.pl
+ ldap/admin/src/scripts/repl-monitor.pl \
+ ldap/admin/src/scripts/setup-ds.pl
+
+perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \
+ ldap/admin/src/scripts/Resource.pm \
+ ldap/admin/src/scripts/Util.pm \
+ ldap/admin/src/scripts/Setup.pm \
+ ldap/admin/src/scripts/SetupDialogs.pm \
+ ldap/admin/src/scripts/Inf.pm \
+ ldap/admin/src/scripts/DialogManager.pm \
+ ldap/admin/src/scripts/Dialog.pm \
+ ldap/admin/src/scripts/DSDialogs.pm \
+ ldap/admin/src/scripts/Setup.pm
+property_DATA = ldap/admin/src/scripts/setup-ds.res
task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2bak \
ldap/admin/src/scripts/template-db2index \
@@ -1243,7 +1265,7 @@
$(libldaputil_a_SOURCES)
libns_dshttpd_la_CPPFLAGS = -I$(srcdir)/include/base $(AM_CPPFLAGS)
-I$(srcdir)/lib/ldaputil @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
+libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
#------------------------
# libslapd
@@ -1883,7 +1905,11 @@
@BUNDLE_FALSE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_FALSE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
@BUNDLE_FALSE@ -e 's,@ECHO_N\@,$(ECHO_N),g' \
-@BUNDLE_FALSE@ -e 's,@ECHO_C\@,$(ECHO_C),g'
+@BUNDLE_FALSE@ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+@BUNDLE_FALSE@ -e 's,@brand\@,$(brand),g' \
+@BUNDLE_FALSE@ -e 's,@capbrand\@,$(capbrand),g' \
+@BUNDLE_FALSE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+@BUNDLE_FALSE@ -e 's,@perldir\@,$(perldir),g'
# these are for the config files and scripts that we need to generate and replace
@@ -1916,7 +1942,11 @@
@BUNDLE_TRUE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_TRUE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
@BUNDLE_TRUE@ -e 's,@ECHO_N\@,$(ECHO_N),g' \
-@BUNDLE_TRUE@ -e 's,@ECHO_C\@,$(ECHO_C),g'
+@BUNDLE_TRUE@ -e 's,@ECHO_C\@,$(ECHO_C),g' \
+@BUNDLE_TRUE@ -e 's,@brand\@,$(brand),g' \
+@BUNDLE_TRUE@ -e 's,@capbrand\@,$(capbrand),g' \
+@BUNDLE_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+@BUNDLE_TRUE@ -e 's,@perldir\@,$(perldir),g'
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -3753,6 +3783,25 @@
echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
rm -f "$(DESTDIR)$(initdir)/$$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
install-taskSCRIPTS: $(task_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(taskdir)" || $(mkdir_p) "$(DESTDIR)$(taskdir)"
@@ -8768,6 +8817,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
install-sampledataDATA: $(sampledata_DATA)
@$(NORMAL_INSTALL)
test -z "$(sampledatadir)" || $(mkdir_p)
"$(DESTDIR)$(sampledatadir)"
@@ -8984,7 +9050,7 @@
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)"
"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)"
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)"
"$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)"
"$(DESTDIR)$(perldir)" "$(DESTDIR)$(taskdir)"
"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)"
"$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -9113,9 +9179,10 @@
info-am:
install-data-am: install-configDATA install-initSCRIPTS \
- install-nodist_propertyDATA install-sampledataDATA \
- install-schemaDATA install-serverLTLIBRARIES \
- install-serverpluginLTLIBRARIES install-taskSCRIPTS
+ install-nodist_propertyDATA install-perlSCRIPTS \
+ install-propertyDATA install-sampledataDATA install-schemaDATA \
+ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
+ install-taskSCRIPTS
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-sbinPROGRAMS
@@ -9148,7 +9215,8 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-nodist_propertyDATA uninstall-sampledataDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA uninstall-sampledataDATA \
uninstall-sbinPROGRAMS uninstall-schemaDATA \
uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
uninstall-taskSCRIPTS
@@ -9165,7 +9233,8 @@
install-binPROGRAMS install-binSCRIPTS install-configDATA \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-initSCRIPTS install-man \
- install-nodist_propertyDATA install-sampledataDATA \
+ install-nodist_propertyDATA install-perlSCRIPTS \
+ install-propertyDATA install-sampledataDATA \
install-sbinPROGRAMS install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
install-strip install-taskSCRIPTS installcheck installcheck-am \
@@ -9174,7 +9243,8 @@
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-nodist_propertyDATA uninstall-sampledataDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA uninstall-sampledataDATA \
uninstall-sbinPROGRAMS uninstall-schemaDATA \
uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
uninstall-taskSCRIPTS