[Fedora-directory-commits] adminserver Makefile.am, 1.39, 1.40 configure.ac, 1.25, 1.26 aclocal.m4, 1.39, 1.40 configure, 1.43, 1.44 missing, 1.29, 1.30 install-sh, 1.29, 1.30 depcomp, 1.29, 1.30 config.sub, 1.29, 1.30 config.guess, 1.29, 1.30 compile, 1.28, 1.29 Makefile.in, 1.46, 1.47
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Mon Jun 9 15:57:15 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15042/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 448366
Description: icu 4.0 will remove the -p option from genrb
Fix Description: we don't need to use the -p option anymore - we can just create the root.res in a unique, program named subdir
This also bumps the version to 1.1.5
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.am 10 Jan 2008 16:48:38 -0000 1.39
+++ Makefile.am 9 Jun 2008 15:57:12 -0000 1.40
@@ -49,14 +49,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; \
+ destdir=`dirname $$file` ; \
+ progname=`basename $$destdir` ; \
+ destfile=$$progname/$$basefile ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
+ $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/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)
@@ -367,14 +371,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
+ 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
MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
# ICU resource file installation is handled specially
@@ -392,8 +396,9 @@
# 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 $* $+
+%/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: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure.ac 10 Jan 2008 16:48:38 -0000 1.25
+++ configure.ac 9 Jun 2008 15:57:12 -0000 1.26
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-admin], [1.1.2], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.5], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- configure 10 Jan 2008 16:48:38 -0000 1.43
+++ configure 9 Jun 2008 15:57:12 -0000 1.44
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.2.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.5.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv-admin'
PACKAGE_TARNAME='dirsrv-admin'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='dirsrv-admin 1.1.2'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='dirsrv-admin 1.1.5'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="admserv/cgi-src40/viewlog.c"
@@ -957,7 +957,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dirsrv-admin 1.1.2 to adapt to many kinds of systems.
+\`configure' configures dirsrv-admin 1.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1023,7 +1023,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv-admin 1.1.2:";;
+ short | recursive ) echo "Configuration of dirsrv-admin 1.1.5:";;
esac
cat <<\_ACEOF
@@ -1202,7 +1202,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv-admin configure 1.1.2
+dirsrv-admin configure 1.1.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1216,7 +1216,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv-admin $as_me 1.1.2, which was
+It was created by dirsrv-admin $as_me 1.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1860,7 +1860,7 @@
# Define the identity of the package.
PACKAGE='dirsrv-admin'
- VERSION='1.1.2'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@ -25613,7 +25613,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv-admin $as_me 1.1.2, which was
+This file was extended by dirsrv-admin $as_me 1.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25676,7 +25676,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv-admin config.status 1.1.2
+dirsrv-admin config.status 1.1.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.in 10 Jan 2008 16:48:38 -0000 1.46
+++ Makefile.in 9 Jun 2008 15:57:12 -0000 1.47
@@ -741,14 +741,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
+ 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
# ICU resource file installation is handled specially
nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
@@ -2360,14 +2360,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
+ destdir=`dirname $$file` ; \
+ progname=`basename $$destdir` ; \
+ destfile=$$progname/$$basefile ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
+ $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
+ cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/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
@@ -2375,8 +2379,9 @@
# 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 $* $+
+%/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