[Fedora-directory-commits] adminserver Makefile.am, 1.38, 1.38.2.1 aclocal.m4, 1.38.2.2, 1.38.2.3 configure, 1.42.2.2, 1.42.2.3 missing, 1.28.2.2, 1.28.2.3 install-sh, 1.28.2.2, 1.28.2.3 Makefile.in, 1.45.2.2, 1.45.2.3 depcomp, 1.28.2.2, 1.28.2.3 config.sub, 1.28.2.2, 1.28.2.3 config.guess, 1.28.2.2, 1.28.2.3 compile, 1.27.2.2, 1.27.2.3
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Mon Jul 14 20:58:48 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver
Modified Files:
Tag: Directory_Server_8_0_Branch
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
remove obsolete code from 8.0 branch
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -r1.38 -r1.38.2.1
--- Makefile.am 17 Dec 2007 20:10:04 -0000 1.38
+++ Makefile.am 14 Jul 2008 20:58:45 -0000 1.38.2.1
@@ -48,15 +48,18 @@
install-data-hook:
@for file in $(RESOURCE_BUNDLES_ROOT) ; do \
- basefile=`basename $$file` ; \
- destfile=`basename $$file | sed -e s,_root,/root,` ; \
- destdir=`dirname $$destfile` ; \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$(DESTDIR)$(propertydir)/$$basefile' '$(DESTDIR)$(propertydir)/$$destfile'"; \
- $(mkdir_p) "$(DESTDIR)$(propertydir)/$$destdir" ; \
- mv "$(DESTDIR)$(propertydir)/$$basefile" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
- cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en.res" || exit 1; \
- cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en_US.res" || exit 1; \
+ progdir=`dirname $$file` ; \
+ progname=`basename $$progdir` ; \
+ destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+ test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir/en.res" || exit 1 ; \
+ cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
done
+# the makefile creates this one, but there seems to be no way to tell it not
+# to, so we have to remove it before it causes problems
+ rm -f $(DESTDIR)$(propertydir)/root.res
cgibindir = $(libdir)@cgibindir@
cmdbindir = $(sbindir)
@@ -93,8 +96,7 @@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
- lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c
libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
@@ -147,7 +149,7 @@
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
@@ -198,7 +200,7 @@
admserv/newinst/src/migrate-ds-admin.pl \
admserv/newinst/src/register-ds-admin.pl
-perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
+perl_DATA = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
@@ -367,14 +369,14 @@
# This bundle must be always distributed and there is no need to have
# *_en.properties resource bundle source files.
RESOURCE_BUNDLES_ROOT = \
- admserv/cgi-src40/admpw_root.res \
- admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \
- admserv/cgi-src40/stopsrv_root.res \
- admserv/cgi-src40/dsconfig_root.res admserv/cgi-src40/monreplication_root.res \
- admserv/cgi-src40/ugdsconfig_root.res admserv/cgi-src40/htmladmin_root.res \
- admserv/cgi-src40/restartsrv_root.res admserv/cgi-src40/viewdata_root.res \
- admserv/cgi-src40/sec-activate_root.res \
- admserv/cgi-src40/viewlog_root.res
+ properties/admpw/root.res \
+ properties/security/root.res properties/config/root.res \
+ properties/stopsrv/root.res \
+ properties/dsconfig/root.res properties/monreplication/root.res \
+ properties/ugdsconfig/root.res properties/htmladmin/root.res \
+ properties/restartsrv/root.res properties/viewdata/root.res \
+ properties/sec-activate/root.res properties/viewlog/root.res \
+ properties/cgicommon/root.res
MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
# ICU resource file installation is handled specially
@@ -392,8 +394,13 @@
# German resource bundles (for the German localization in the future)
#RESOURCE_BUNDLES_DE = foo_de.res
-%_root.res : %.properties
- $(ICU_GENRB) -s. -d. --encoding 8859-1 --package-name $* $+
+properties/%/root.res : admserv/cgi-src40/%.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
+%/root.res : %.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
%_fr.res : %_fr.properties
$(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -u -r1.45.2.2 -r1.45.2.3
--- Makefile.in 15 Apr 2008 16:47:31 -0000 1.45.2.2
+++ Makefile.in 14 Jul 2008 20:58:45 -0000 1.45.2.3
@@ -93,20 +93,18 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
- "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
- "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
"$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
"$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
- "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
am__objects_1 = lib/base/file.lo lib/base/nscperror.lo \
lib/base/system.lo lib/base/nscputil.lo
-am__objects_2 = lib/libsi18n/coreres.lo lib/libsi18n/getlang.lo \
- lib/libsi18n/getstrprop.lo lib/libsi18n/propset.lo \
- lib/libsi18n/reshash.lo lib/libsi18n/txtfile.lo
+am__objects_2 = lib/libsi18n/getstrprop.lo
am__objects_3 = lib/libadmin/cluster.lo lib/libadmin/dllglue.lo \
lib/libadmin/error.lo lib/libadmin/form_get.lo \
lib/libadmin/httpcon.lo lib/libadmin/install.lo \
@@ -202,11 +200,9 @@
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) \
- $(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+ $(nodist_cmdbin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -258,13 +254,16 @@
dist_htmlDATA_INSTALL = $(INSTALL_DATA)
dist_iconDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
+initconfigDATA_INSTALL = $(INSTALL_DATA)
ldifDATA_INSTALL = $(INSTALL_DATA)
nodist_configDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
+perlDATA_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) $(property_DATA)
+ $(inf_DATA) $(initconfig_DATA) $(ldif_DATA) \
+ $(nodist_config_DATA) $(nodist_property_DATA) $(perl_DATA) \
+ $(property_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = mod_admserv mod_restartd
@@ -505,9 +504,7 @@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
- lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
-
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c
libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
@@ -542,7 +539,7 @@
@CXXLINK_REQUIRED_FALSE at MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE at MYLINK = $(CXXLINK)
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+initconfig_DATA = 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 \
@@ -587,7 +584,7 @@
admserv/newinst/src/migrate-ds-admin.pl \
admserv/newinst/src/register-ds-admin.pl
-perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \
+perl_DATA = admserv/newinst/src/ASDialogs.pm \
admserv/newinst/src/AdminUtil.pm \
admserv/newinst/src/AdminServer.pm \
admserv/newinst/src/ConfigDSDialogs.pm \
@@ -740,14 +737,14 @@
# This bundle must be always distributed and there is no need to have
# *_en.properties resource bundle source files.
RESOURCE_BUNDLES_ROOT = \
- admserv/cgi-src40/admpw_root.res \
- admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \
- admserv/cgi-src40/stopsrv_root.res \
- admserv/cgi-src40/dsconfig_root.res admserv/cgi-src40/monreplication_root.res \
- admserv/cgi-src40/ugdsconfig_root.res admserv/cgi-src40/htmladmin_root.res \
- admserv/cgi-src40/restartsrv_root.res admserv/cgi-src40/viewdata_root.res \
- admserv/cgi-src40/sec-activate_root.res \
- admserv/cgi-src40/viewlog_root.res
+ properties/admpw/root.res \
+ properties/security/root.res properties/config/root.res \
+ properties/stopsrv/root.res \
+ properties/dsconfig/root.res properties/monreplication/root.res \
+ properties/ugdsconfig/root.res properties/htmladmin/root.res \
+ properties/restartsrv/root.res properties/viewdata/root.res \
+ properties/sec-activate/root.res properties/viewlog/root.res \
+ properties/cgicommon/root.res
# ICU resource file installation is handled specially
nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
@@ -1005,18 +1002,8 @@
lib/libsi18n/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) lib/libsi18n/$(DEPDIR)
@: > lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/coreres.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/getlang.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libsi18n/getstrprop.lo: lib/libsi18n/$(am__dirstamp) \
lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/propset.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/reshash.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/txtfile.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libadmin/$(am__dirstamp):
@$(mkdir_p) lib/libadmin
@: > lib/libadmin/$(am__dirstamp)
@@ -1290,25 +1277,6 @@
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)"
@@ -1328,25 +1296,6 @@
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)
@@ -1412,18 +1361,8 @@
-rm -f lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT)
- -rm -f lib/libsi18n/coreres.$(OBJEXT)
- -rm -f lib/libsi18n/coreres.lo
- -rm -f lib/libsi18n/getlang.$(OBJEXT)
- -rm -f lib/libsi18n/getlang.lo
-rm -f lib/libsi18n/getstrprop.$(OBJEXT)
-rm -f lib/libsi18n/getstrprop.lo
- -rm -f lib/libsi18n/propset.$(OBJEXT)
- -rm -f lib/libsi18n/propset.lo
- -rm -f lib/libsi18n/reshash.$(OBJEXT)
- -rm -f lib/libsi18n/reshash.lo
- -rm -f lib/libsi18n/txtfile.$(OBJEXT)
- -rm -f lib/libsi18n/txtfile.lo
distclean-compile:
-rm -f *.tab.c
@@ -1477,12 +1416,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_updown.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/coreres.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/getlang.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/getstrprop.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/propset.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/reshash.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at lib/libsi18n/$(DEPDIR)/txtfile.Plo at am__quote@
.c.o:
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -1864,6 +1798,23 @@
echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \
rm -f "$(DESTDIR)$(infdir)/$$f"; \
done
+install-initconfigDATA: $(initconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)"
+ @list='$(initconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(initconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \
+ $(initconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \
+ done
+
+uninstall-initconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(initconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \
+ done
install-ldifDATA: $(ldif_DATA)
@$(NORMAL_INSTALL)
test -z "$(ldifdir)" || $(mkdir_p) "$(DESTDIR)$(ldifdir)"
@@ -1915,6 +1866,23 @@
echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \
rm -f "$(DESTDIR)$(propertydir)/$$f"; \
done
+install-perlDATA: $(perl_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)"
+ @list='$(perl_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(perlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \
+ $(perlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \
+ done
+
+uninstall-perlDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(perl_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(perldir)/$$f"; \
+ done
install-propertyDATA: $(property_DATA)
@$(NORMAL_INSTALL)
test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
@@ -2213,7 +2181,7 @@
$(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- 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 \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -2278,9 +2246,9 @@
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
install-cmdbinSCRIPTS install-dist_helpDATA \
install-dist_htmlDATA install-dist_iconDATA install-infDATA \
- install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
+ install-initSCRIPTS install-initconfigDATA install-ldifDATA \
install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
+ install-nodist_propertyDATA install-perlDATA \
install-propertyDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -2317,10 +2285,10 @@
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-initconfigDATA uninstall-ldifDATA \
uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-perlDATA uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2337,10 +2305,10 @@
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-initconfigSCRIPTS install-ldifDATA \
+ install-initSCRIPTS install-initconfigDATA install-ldifDATA \
install-libLTLIBRARIES install-man \
install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
+ install-nodist_propertyDATA install-perlDATA \
install-propertyDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
@@ -2351,10 +2319,10 @@
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-initconfigDATA uninstall-ldifDATA \
uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-perlDATA uninstall-propertyDATA
define NL
\\n
@@ -2362,15 +2330,18 @@
install-data-hook:
@for file in $(RESOURCE_BUNDLES_ROOT) ; do \
- basefile=`basename $$file` ; \
- destfile=`basename $$file | sed -e s,_root,/root,` ; \
- destdir=`dirname $$destfile` ; \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$(DESTDIR)$(propertydir)/$$basefile' '$(DESTDIR)$(propertydir)/$$destfile'"; \
- $(mkdir_p) "$(DESTDIR)$(propertydir)/$$destdir" ; \
- mv "$(DESTDIR)$(propertydir)/$$basefile" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
- cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en.res" || exit 1; \
- cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en_US.res" || exit 1; \
- done
+ progdir=`dirname $$file` ; \
+ progname=`basename $$progdir` ; \
+ destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+ test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir/en.res" || exit 1 ; \
+ cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
+ done
+# the makefile creates this one, but there seems to be no way to tell it not
+# to, so we have to remove it before it causes problems
+ rm -f $(DESTDIR)$(propertydir)/root.res
# French resource bundles (for the French localization in the future)
#RESOURCE_BUNDLES_FR = foo_fr.res
@@ -2378,8 +2349,13 @@
# German resource bundles (for the German localization in the future)
#RESOURCE_BUNDLES_DE = foo_de.res
-%_root.res : %.properties
- $(ICU_GENRB) -s. -d. --encoding 8859-1 --package-name $* $+
+properties/%/root.res : admserv/cgi-src40/%.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
+%/root.res : %.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
%_fr.res : %_fr.properties
$(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+
More information about the Fedora-directory-commits
mailing list