* bootstrap (runtime-po/Makevars): Derive from po/Makevars

instead of from the template, to simplify configuration a bit.
* bootstrap.conf (excluded_files): Don't exclude m4/codeset.m4
and m4/wint_t.m4, as they are needed with the latest gnulib.
This commit is contained in:
Paul Eggert
2006-11-08 20:01:48 +00:00
parent 17bd8a736a
commit ac564be451
3 changed files with 12 additions and 12 deletions

View File

@@ -1,3 +1,10 @@
2006-11-08 Paul Eggert <eggert@cs.ucla.edu>
* bootstrap (runtime-po/Makevars): Derive from po/Makevars
instead of from the template, to simplify configuration a bit.
* bootstrap.conf (excluded_files): Don't exclude m4/codeset.m4
and m4/wint_t.m4, as they are needed with the latest gnulib.
2006-10-31 Joel E. Denny <jdenny@ces.clemson.edu> 2006-10-31 Joel E. Denny <jdenny@ces.clemson.edu>
Disable unset/unused mid-rule value warnings by default, and recognize Disable unset/unused mid-rule value warnings by default, and recognize

View File

@@ -475,18 +475,13 @@ sed '
' po/Makevars.template >po/Makevars ' po/Makevars.template >po/Makevars
if test -d runtime-po; then if test -d runtime-po; then
# Similarly for runtime-po/Makevars, but not quite the same. # Likewise for runtime-po/Makevars, except also change a few other parameters.
rm -f runtime-po/Makevars rm -f runtime-po/Makevars
sed ' sed '
/^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/
/^subdir *=.*/s/=.*/= runtime-po/ s/^\(subdir\) *=.*/\1 = runtime-po/
/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/
/^XGETTEXT_OPTIONS *=/{ ' <po/Makevars >runtime-po/Makevars
s/$/ \\/
a\
'"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
}
' <po/Makevars.template >runtime-po/Makevars
# Copy identical files from po to runtime-po. # Copy identical files from po to runtime-po.
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)

View File

@@ -47,7 +47,6 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
# Gettext supplies these files, but we don't need them since # Gettext supplies these files, but we don't need them since
# we don't have an intl subdirectory. # we don't have an intl subdirectory.
excluded_files=' excluded_files='
m4/codeset.m4
m4/glibc2.m4 m4/glibc2.m4
m4/glibc21.m4 m4/glibc21.m4
m4/intdiv0.m4 m4/intdiv0.m4
@@ -62,6 +61,5 @@ excluded_files='
m4/uintmax_t.m4 m4/uintmax_t.m4
m4/ulonglong.m4 m4/ulonglong.m4
m4/visibility.m4 m4/visibility.m4
m4/wint_t.m4
m4/xsize.m4 m4/xsize.m4
' '