mirror of
https://https.git.savannah.gnu.org/git/gettext.git
synced 2026-01-26 15:39:11 +00:00
New directory gettext-tools/wizard/po-templates/traditional/.
* gettext-tools/wizard/po-templates/traditional/*: New files, moved here from gettext-runtime/po/. * gettext-tools/wizard/po-templates/traditional/Makefile.in.in (install-data, installdirs-data, uninstall-data, dist2): Remove special code for the 'gettext-tools' package. * gettext-tools/wizard/po-templates/traditional/Makevars.template: Moved here from gettext-tools/po/. * autogen.sh: Copy the contents of the gettext-runtime/po/ and gettext-tools/po/ directories from gettext-tools/wizard/po-templates/traditional/. * gettext-tools/wizard/Makefile.am (pkgdatadir, podir): New variables. (po_DATA): Add po-templates/traditional/*. (EXTRA_DIST): Likewise. (uninstall-sources): Also remove $(podir)/Makevars. * Makefile.am (distcheck-hook): Update.
This commit is contained in:
Bruno Haible
parent
5847bb1df1
commit
8c716a85ec
10
.gitignore
vendored
10
.gitignore
vendored
@ -392,7 +392,15 @@
|
||||
/gettext-runtime/libasprintf/ChangeLog
|
||||
/gettext-tools/ChangeLog
|
||||
/gettext-tools/examples/ChangeLog
|
||||
# Files copied from gettext-runtime:
|
||||
# Files copied:
|
||||
/gettext-runtime/po/Makefile.in.in
|
||||
/gettext-runtime/po/Rules-quot
|
||||
/gettext-runtime/po/boldquot.sed
|
||||
/gettext-runtime/po/en@boldquot.header
|
||||
/gettext-runtime/po/en@quot.header
|
||||
/gettext-runtime/po/insert-header.sed
|
||||
/gettext-runtime/po/quot.sed
|
||||
/gettext-runtime/po/remove-potcdate.sed
|
||||
/gettext-tools/ABOUT-NLS
|
||||
/gettext-tools/po/Makefile.in.in
|
||||
/gettext-tools/po/Rules-quot
|
||||
|
||||
26
Makefile.am
26
Makefile.am
@ -66,15 +66,23 @@ $(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-to
|
||||
|
||||
distcheck-hook:
|
||||
# Verify that some files are the same.
|
||||
cmp -s $(srcdir)/gettext-runtime/po/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in
|
||||
cmp -s $(srcdir)/gettext-runtime/po/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot
|
||||
cmp -s $(srcdir)/gettext-runtime/po/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed
|
||||
cmp -s $(srcdir)/gettext-runtime/po/quot.sed $(srcdir)/gettext-tools/po/quot.sed
|
||||
cmp -s $(srcdir)/gettext-runtime/po/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header
|
||||
cmp -s $(srcdir)/gettext-runtime/po/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header
|
||||
cmp -s $(srcdir)/gettext-runtime/po/insert-header.sed $(srcdir)/gettext-tools/po/insert-header.sed
|
||||
cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sed $(srcdir)/gettext-tools/po/remove-potcdate.sed
|
||||
cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sed $(srcdir)/gettext-tools/examples/po/remove-potcdate.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Makefile.in.in $(srcdir)/gettext-runtime/po/Makefile.in.in
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Rules-quot $(srcdir)/gettext-runtime/po/Rules-quot
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/boldquot.sed $(srcdir)/gettext-runtime/po/boldquot.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/quot.sed $(srcdir)/gettext-runtime/po/quot.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@quot.header $(srcdir)/gettext-runtime/po/en@quot.header
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@boldquot.header $(srcdir)/gettext-runtime/po/en@boldquot.header
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/insert-header.sed $(srcdir)/gettext-runtime/po/insert-header.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-runtime/po/remove-potcdate.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/quot.sed $(srcdir)/gettext-tools/po/quot.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/insert-header.sed $(srcdir)/gettext-tools/po/insert-header.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-tools/po/remove-potcdate.sed
|
||||
cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-tools/examples/po/remove-potcdate.sed
|
||||
cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4
|
||||
cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4
|
||||
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
||||
|
||||
28
autogen.sh
28
autogen.sh
@ -646,6 +646,16 @@ aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
|
||||
|| exit $?
|
||||
cd "$dir0"
|
||||
|
||||
echo "$0: copying common files to gettext-runtime..."
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/Makefile.in.in gettext-runtime/po/Makefile.in.in
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/Rules-quot gettext-runtime/po/Rules-quot
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/boldquot.sed gettext-runtime/po/boldquot.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/quot.sed gettext-runtime/po/quot.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/en@quot.header gettext-runtime/po/en@quot.header
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/en@boldquot.header gettext-runtime/po/en@boldquot.header
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/insert-header.sed gettext-runtime/po/insert-header.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed gettext-runtime/po/remove-potcdate.sed
|
||||
|
||||
echo "$0: generating configure in gettext-runtime..."
|
||||
cd gettext-runtime
|
||||
aclocal -I m4 -I ../m4 -I gnulib-m4 \
|
||||
@ -674,16 +684,16 @@ aclocal -I ../../gettext-runtime/m4 -I ../../m4 \
|
||||
|| exit $?
|
||||
cd "$dir0"
|
||||
|
||||
echo "$0: copying common files from gettext-runtime to gettext-tools..."
|
||||
echo "$0: copying common files to gettext-tools..."
|
||||
cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
|
||||
cp -p gettext-runtime/po/Makefile.in.in gettext-tools/po/Makefile.in.in
|
||||
cp -p gettext-runtime/po/Rules-quot gettext-tools/po/Rules-quot
|
||||
cp -p gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed
|
||||
cp -p gettext-runtime/po/quot.sed gettext-tools/po/quot.sed
|
||||
cp -p gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header
|
||||
cp -p gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header
|
||||
cp -p gettext-runtime/po/insert-header.sed gettext-tools/po/insert-header.sed
|
||||
cp -p gettext-runtime/po/remove-potcdate.sed gettext-tools/po/remove-potcdate.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/Makefile.in.in gettext-tools/po/Makefile.in.in
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/Rules-quot gettext-tools/po/Rules-quot
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/boldquot.sed gettext-tools/po/boldquot.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/quot.sed gettext-tools/po/quot.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/en@quot.header gettext-tools/po/en@quot.header
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/en@boldquot.header gettext-tools/po/en@boldquot.header
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/insert-header.sed gettext-tools/po/insert-header.sed
|
||||
cp -p gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed gettext-tools/po/remove-potcdate.sed
|
||||
|
||||
echo "$0: generating configure in gettext-tools..."
|
||||
cd gettext-tools
|
||||
|
||||
@ -30,8 +30,28 @@ bin_SCRIPTS = gettextize
|
||||
DISTCLEANFILES += gettextize
|
||||
|
||||
|
||||
# gettextize copies these files into packages.
|
||||
|
||||
pkgdatadir = $(datadir)/gettext
|
||||
podir = $(pkgdatadir)/po
|
||||
po_DATA = \
|
||||
po-templates/traditional/Makefile.in.in \
|
||||
po-templates/traditional/remove-potcdate.sed \
|
||||
po-templates/traditional/Makevars.template \
|
||||
po-templates/traditional/Rules-quot \
|
||||
po-templates/traditional/quot.sed \
|
||||
po-templates/traditional/boldquot.sed \
|
||||
po-templates/traditional/en@quot.header \
|
||||
po-templates/traditional/en@boldquot.header \
|
||||
po-templates/traditional/insert-header.sed
|
||||
|
||||
EXTRA_DIST += $(po_DATA)
|
||||
|
||||
|
||||
# We don't install the source code in unpacked form any more.
|
||||
# We don't install the Makevars file any more either.
|
||||
install-data-local: uninstall-sources
|
||||
uninstall-local: uninstall-sources
|
||||
uninstall-sources:
|
||||
rm -rf $(DESTDIR)$(datadir)/gettext/intl
|
||||
rm -rf $(DESTDIR)$(pkgdatadir)/intl \
|
||||
$(DESTDIR)$(podir)/Makevars
|
||||
|
||||
@ -358,18 +358,6 @@ $(POFILES):
|
||||
install: install-exec install-data
|
||||
install-exec:
|
||||
install-data: install-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
$(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
for file in $(DISTFILES.common) Makevars.template; do \
|
||||
$(INSTALL_DATA) $(srcdir)/$$file \
|
||||
$(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
done; \
|
||||
for file in Makevars; do \
|
||||
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
done; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
install-data-no: all
|
||||
install-data-yes: all
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
@ -416,11 +404,6 @@ install-strip: install
|
||||
installdirs: installdirs-exec installdirs-data
|
||||
installdirs-exec:
|
||||
installdirs-data: installdirs-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
$(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
installdirs-data-no:
|
||||
installdirs-data-yes:
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
@ -460,13 +443,6 @@ installcheck:
|
||||
uninstall: uninstall-exec uninstall-data
|
||||
uninstall-exec:
|
||||
uninstall-data: uninstall-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
for file in $(DISTFILES.common) Makevars.template; do \
|
||||
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
done; \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
uninstall-data-no:
|
||||
uninstall-data-yes:
|
||||
catalogs='$(CATALOGS)'; \
|
||||
@ -506,9 +482,6 @@ dist distdir:
|
||||
# This is a separate target because 'update-po' must be executed before.
|
||||
dist2: $(srcdir)/stamp-po $(DISTFILES)
|
||||
@dists="$(DISTFILES)"; \
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
dists="$$dists Makevars.template"; \
|
||||
fi; \
|
||||
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
||||
dists="$$dists $(DOMAIN).pot stamp-po"; \
|
||||
else \
|
||||
Loading…
x
Reference in New Issue
Block a user