gcc/, libcpp/
gcc/, libcpp/ * Makefile.in (CATALOGS): Add po/ prefix. * configure: Regenerated. config/ * gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some defines otherwise gotten from AM_GNU_GETTEXT. Remove the po/ prefix from CATALOGS. From-SVN: r114268
This commit is contained in:
Daniel Jacobowitz
Daniel Jacobowitz
parent
4fe56d8325
commit
5c3c36836e
|
|
@ -1,3 +1,9 @@
|
|||
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
|
||||
|
||||
* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some
|
||||
defines otherwise gotten from AM_GNU_GETTEXT. Remove the
|
||||
po/ prefix from CATALOGS.
|
||||
|
||||
2006-02-14 Paolo Bonzini <bonzini@gnu.org>
|
||||
Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ else
|
|||
# by the backticks, then collapsed again by the double quotes,
|
||||
# leaving us with one backslash in the sed expression (right
|
||||
# before the dot that mustn't act as a wildcard).
|
||||
cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"`
|
||||
cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
|
||||
# The user is allowed to set LINGUAS to a list of languages to
|
||||
# install catalogs for. If it's empty that means "all of them."
|
||||
if test "x$LINGUAS" = x; then
|
||||
|
|
@ -63,4 +63,17 @@ else
|
|||
done
|
||||
LINGUAS="$XLINGUAS"
|
||||
AC_MSG_RESULT($LINGUAS)
|
||||
|
||||
dnl Set up some additional variables which our po/Make-in files
|
||||
dnl may need.
|
||||
|
||||
dnl For backward compatibility. Some Makefiles may be using these.
|
||||
DATADIRNAME=share
|
||||
AC_SUBST(DATADIRNAME)
|
||||
INSTOBJEXT=.mo
|
||||
AC_SUBST(INSTOBJEXT)
|
||||
GENCAT=gencat
|
||||
AC_SUBST(GENCAT)
|
||||
CATOBJEXT=.gmo
|
||||
AC_SUBST(CATOBJEXT)
|
||||
fi])
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
|
||||
|
||||
* Makefile.in (CATALOGS): Add po/ prefix.
|
||||
* configure: Regenerated.
|
||||
|
||||
2006-05-31 Richard Earnshaw <richard.earnshaw@arm.com>
|
||||
|
||||
PR target/27829
|
||||
|
|
|
|||
|
|
@ -4633,7 +4633,7 @@ risky-stage4: stage4
|
|||
XGETTEXT = @XGETTEXT@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGMERGE = msgmerge
|
||||
CATALOGS = @CATALOGS@
|
||||
CATALOGS = $(patsubst %,po/%,@CATALOGS@)
|
||||
|
||||
.PHONY: build- install- build-po install-po update-po
|
||||
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_selected_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_selected_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='language_hooks'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -12489,8 +12489,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
|||
# by the backticks, then collapsed again by the double quotes,
|
||||
# leaving us with one backslash in the sed expression (right
|
||||
# before the dot that mustn't act as a wildcard).
|
||||
cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"`
|
||||
cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
|
||||
# The user is allowed to set LINGUAS to a list of languages to
|
||||
# install catalogs for. If it's empty that means "all of them."
|
||||
if test "x$LINGUAS" = x; then
|
||||
|
|
@ -12507,6 +12507,16 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
|||
LINGUAS="$XLINGUAS"
|
||||
echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
||||
echo "${ECHO_T}$LINGUAS" >&6
|
||||
|
||||
|
||||
DATADIRNAME=share
|
||||
|
||||
INSTOBJEXT=.mo
|
||||
|
||||
GENCAT=gencat
|
||||
|
||||
CATOBJEXT=.gmo
|
||||
|
||||
fi
|
||||
|
||||
# If LIBINTL contains LIBICONV, then clear LIBICONV so we don't get
|
||||
|
|
@ -16813,6 +16823,10 @@ s,@XGETTEXT@,$XGETTEXT,;t t
|
|||
s,@GMSGFMT@,$GMSGFMT,;t t
|
||||
s,@POSUB@,$POSUB,;t t
|
||||
s,@CATALOGS@,$CATALOGS,;t t
|
||||
s,@DATADIRNAME@,$DATADIRNAME,;t t
|
||||
s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
||||
s,@GENCAT@,$GENCAT,;t t
|
||||
s,@CATOBJEXT@,$CATOBJEXT,;t t
|
||||
s,@host_cc_for_libada@,$host_cc_for_libada,;t t
|
||||
s,@CROSS@,$CROSS,;t t
|
||||
s,@ALL@,$ALL,;t t
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
|
||||
|
||||
* Makefile.in (CATALOGS): Add po/ prefix.
|
||||
* configure: Regenerated.
|
||||
|
||||
2006-05-23 Carlos O'Donell <carlos@codesourcery.com>
|
||||
|
||||
* Makefile.in: Add install-html target. Add install-html to .PHONY
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ ARFLAGS = cru
|
|||
ACLOCAL = @ACLOCAL@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
CATALOGS = @CATALOGS@
|
||||
CATALOGS = $(patsubst %,po/%,@CATALOGS@)
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
WARN_CFLAGS = @WARN_CFLAGS@ @WARN_PEDANTIC@ @WERROR@
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB ACLOCAL AUTOCONF AUTOHEADER WARN_CFLAGS WARN_PEDANTIC WERROR am__leading_dot DEPDIR CCDEPMODE CPP EGREP LIBOBJS ALLOCA USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS LIBICONV LTLIBICONV PACKAGE USED_CATALOGS MAINT 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB ACLOCAL AUTOCONF AUTOHEADER WARN_CFLAGS WARN_PEDANTIC WERROR am__leading_dot DEPDIR CCDEPMODE CPP EGREP LIBOBJS ALLOCA USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT LIBICONV LTLIBICONV PACKAGE USED_CATALOGS MAINT LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -7297,8 +7297,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
|||
# by the backticks, then collapsed again by the double quotes,
|
||||
# leaving us with one backslash in the sed expression (right
|
||||
# before the dot that mustn't act as a wildcard).
|
||||
cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"`
|
||||
cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
|
||||
lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
|
||||
# The user is allowed to set LINGUAS to a list of languages to
|
||||
# install catalogs for. If it's empty that means "all of them."
|
||||
if test "x$LINGUAS" = x; then
|
||||
|
|
@ -7315,6 +7315,16 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
|||
LINGUAS="$XLINGUAS"
|
||||
echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
||||
echo "${ECHO_T}$LINGUAS" >&6
|
||||
|
||||
|
||||
DATADIRNAME=share
|
||||
|
||||
INSTOBJEXT=.mo
|
||||
|
||||
GENCAT=gencat
|
||||
|
||||
CATOBJEXT=.gmo
|
||||
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking for uchar" >&5
|
||||
|
|
@ -8925,6 +8935,10 @@ s,@XGETTEXT@,$XGETTEXT,;t t
|
|||
s,@GMSGFMT@,$GMSGFMT,;t t
|
||||
s,@POSUB@,$POSUB,;t t
|
||||
s,@CATALOGS@,$CATALOGS,;t t
|
||||
s,@DATADIRNAME@,$DATADIRNAME,;t t
|
||||
s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
||||
s,@GENCAT@,$GENCAT,;t t
|
||||
s,@CATOBJEXT@,$CATOBJEXT,;t t
|
||||
s,@LIBICONV@,$LIBICONV,;t t
|
||||
s,@LTLIBICONV@,$LTLIBICONV,;t t
|
||||
s,@PACKAGE@,$PACKAGE,;t t
|
||||
|
|
|
|||
Loading…
Reference in New Issue