[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS: a2ps/po Makefile.in.in,1.3,1.4
|
From: |
Akim Demaille <address@hidden> |
|
Subject: |
CVS: a2ps/po Makefile.in.in,1.3,1.4 |
|
Date: |
Mon, 25 Mar 2002 12:20:17 -0500 |
Update of /cvsroot/a2ps/a2ps/po
In directory subversions:/tmp/cvs-serv19234/po
Modified Files:
Makefile.in.in
Log Message:
Gettext 0.11.1.
* lib/Makefile.am (noinst_HEADERS): Add gettext.h.
* lib/system.h: Use lib/gettext.h.
* src/Makefile.am, contrib/sample/Makefile.am: @LIBINTL@ instead
of @address@hidden
Index: Makefile.in.in
===================================================================
RCS file: /cvsroot/a2ps/a2ps/po/Makefile.in.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in.in 22 Mar 2002 14:53:14 -0000 1.3
--- Makefile.in.in 25 Mar 2002 17:20:13 -0000 1.4
***************
*** 1,17 ****
! # Makefile for program source directory in GNU NLS utilities package.
! # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <address@hidden>
#
! # This file file be copied and used freely without restrictions. It can
! # be used in projects which are not available under the GNU Public License
! # but which still want to provide support for the GNU gettext functionality.
! # Please note that the actual code is *not* freely available.
PACKAGE = @PACKAGE@
VERSION = @VERSION@
- # These two variables depend on the location of this directory.
- subdir = po
- top_builddir = ..
-
SHELL = /bin/sh
@SET_MAKE@
--- 1,15 ----
! # Makefile for PO directory in any package using GNU gettext.
! # Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <address@hidden>
#
! # This file can be copied and used freely without restrictions. It can
! # be used in projects which are not available under the GNU General Public
! # License but which still want to provide support for the GNU gettext
! # functionality.
! # Please note that the actual code of GNU gettext is covered by the GNU
! # General Public License and is *not* in the public domain.
PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
***************
*** 32,53 ****
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
- CC = @CC@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
!
! DEFS = @DEFS@
! CFLAGS = @CFLAGS@
! CPPFLAGS = @CPPFLAGS@
!
! INCLUDES = -I.. -I$(top_srcdir)/intl
!
! COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
POFILES = @POFILES@
GMOFILES = @GMOFILES@
! DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
! $(POFILES) $(GMOFILES)
POTFILES = \
--- 30,51 ----
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
! MSGMERGE_UPDATE = @MSGMERGE@ --update
! MSGINIT = msginit
! MSGCONV = msgconv
! MSGFILTER = msgfilter
POFILES = @POFILES@
GMOFILES = @GMOFILES@
! UPDATEPOFILES = @UPDATEPOFILES@
! DUMMYPOFILES = @DUMMYPOFILES@
! DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
! $(DISTFILES.common.extra1) $(DISTFILES.common.extra2)
$(DISTFILES.common.extra3)
! DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
! $(POFILES) $(GMOFILES) \
! $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
POTFILES = \
***************
*** 55,74 ****
CATALOGS = @CATALOGS@
! .SUFFIXES:
! .SUFFIXES: .c .o .po .pox .gmo .mo
!
! .c.o:
! $(COMPILE) $<
! .po.pox:
! $(MAKE) $(PACKAGE).pot
! $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
.po.mo:
! $(MSGFMT) -o $@ $<
.po.gmo:
! file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
! && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
--- 53,74 ----
CATALOGS = @CATALOGS@
! # Makevars gets inserted here. (Don't remove this line!)
! .SUFFIXES:
! .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
.po.mo:
! @echo "$(MSGFMT) -c -o $@ $<"; \
! $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
.po.gmo:
! @lang=`echo $* | sed -e 's,.*/,,'`; \
! test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o
$${lang}.gmo $${lang}.po"; \
! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o
t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
!
! .sin.sed:
! sed -e '/^#/d' $< > t-$@
! mv t-$@ $@
***************
*** 78,92 ****
all-no:
! # Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
! $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
! $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
! --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
! && test ! -f $(PACKAGE).po \
! || ( rm -f $(srcdir)/$(PACKAGE).pot \
! && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
--- 78,113 ----
all-no:
! # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
! $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
! $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
! --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
! --copyright-holder='$(COPYRIGHT_HOLDER)'
! test ! -f $(DOMAIN).po || { \
! if test -f $(srcdir)/$(DOMAIN).pot; then \
! sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
! sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
! if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
! rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
! else \
! rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
! mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
! fi; \
! else \
! mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
! fi; \
! }
!
! $(srcdir)/$(DOMAIN).pot:
! $(MAKE) $(DOMAIN).pot-update
!
! $(POFILES): $(srcdir)/$(DOMAIN).pot
! @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
! test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
! echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
! cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
***************
*** 96,101 ****
if test "$(PACKAGE)" = "gettext"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
! $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
! $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
--- 117,124 ----
if test "$(PACKAGE)" = "gettext"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
! for file in $(DISTFILES.common); do \
! $(INSTALL_DATA) $(srcdir)/$$file \
! $(DESTDIR)$(gettextsrcdir)/$$file; \
! done; \
else \
: ; \
***************
*** 107,138 ****
for cat in $$catalogs; do \
cat=`basename $$cat`; \
! lang=`echo $$cat | sed 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
! if test -r $$cat; then \
! $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
! echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
! else \
! $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
! echo "installing $(srcdir)/$$cat as" \
! "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
! fi; \
done
! # Define this as empty until I found a useful application.
! installcheck:
! uninstall:
! catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
! lang=`echo $$cat | sed 's/\.gmo$$//'`; \
! rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
done
if test "$(PACKAGE)" = "gettext"; then \
! rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
check: all
--- 130,236 ----
for cat in $$catalogs; do \
cat=`basename $$cat`; \
! lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
! if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat;
fi; \
! $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
! echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
! for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
! if test -n "$$lc"; then \
! if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc
2>/dev/null) | grep ' -> ' >/dev/null; then \
! link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d
$$lc | sed -e 's/^.* -> //'`; \
! mv $(DESTDIR)$(localedir)/$$lang/$$lc
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
! mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
! (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
! for file in *; do \
! if test -f $$file; then \
! ln -s ../$$link/$$file
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
! fi; \
! done); \
! rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
! else \
! if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
! :; \
! else \
! rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
! mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
! fi; \
! fi; \
! rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
! ln -s ../LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
! ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
! cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
! echo "installing $$realcat link as
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
! fi; \
! done; \
done
! install-strip: install
! installdirs: installdirs-exec installdirs-data
! installdirs-exec:
! installdirs-data: address@hidden@
! if test "$(PACKAGE)" = "gettext"; then \
! $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
! else \
! : ; \
! fi
! installdirs-data-no:
! installdirs-data-yes:
! $(mkinstalldirs) $(DESTDIR)$(datadir)
! @catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
! lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
! dir=$(localedir)/$$lang/LC_MESSAGES; \
! $(mkinstalldirs) $(DESTDIR)$$dir; \
! for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
! if test -n "$$lc"; then \
! if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc
2>/dev/null) | grep ' -> ' >/dev/null; then \
! link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d
$$lc | sed -e 's/^.* -> //'`; \
! mv $(DESTDIR)$(localedir)/$$lang/$$lc
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
! mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
! (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
! for file in *; do \
! if test -f $$file; then \
! ln -s ../$$link/$$file
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
! fi; \
! done); \
! rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
! else \
! if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
! :; \
! else \
! rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
! mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
! fi; \
! fi; \
! fi; \
! done; \
done
+
+ # Define this as empty until I found a useful application.
+ installcheck:
+
+ uninstall: uninstall-exec uninstall-data
+ uninstall-exec:
+ uninstall-data: address@hidden@
if test "$(PACKAGE)" = "gettext"; then \
! for file in $(DISTFILES.common); do \
! rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
! done; \
else \
: ; \
fi
+ uninstall-data-no:
+ uninstall-data-yes:
+ catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ done; \
+ done
check: all
***************
*** 141,145 ****
mostlyclean:
! rm -f core core.* *.pox $(PACKAGE).po *.new.po
rm -fr *.o
--- 239,244 ----
mostlyclean:
! rm -f remove-potcdate.sed
! rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
***************
*** 161,186 ****
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
for file in $$dists; do \
! if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
! cp -p $$dir/$$file $(distdir); \
done
update-po: Makefile
! $(MAKE) $(PACKAGE).pot
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
cd $(srcdir); \
! catalogs='$(GMOFILES)'; \
! for cat in $$catalogs; do \
! cat=`basename $$cat`; \
! lang=`echo $$cat | sed 's/\.gmo$$//'`; \
! echo "$$lang:"; \
! if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
! mv -f $$lang.new.po $$lang.po; \
else \
! echo "msgmerge for $$cat failed!"; \
! rm -f $$lang.new.po; \
fi; \
! done
! $(MAKE) update-gmo
update-gmo: Makefile $(GMOFILES)
--- 260,305 ----
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
+ if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
for file in $$dists; do \
! if test -f $$file; then \
! cp -p $$file $(distdir); \
! else \
! cp -p $(srcdir)/$$file $(distdir); \
! fi; \
done
update-po: Makefile
! $(MAKE) $(DOMAIN).pot-update
! $(MAKE) $(UPDATEPOFILES)
! $(MAKE) update-gmo
!
! # General rule for updating PO files.
!
! .nop.po-update:
! @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
! if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
! if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
! rm -f $$tmpdir/$$lang.new.po; \
else \
! if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
! :; \
! else \
! echo "msgmerge for $$lang.po failed: cannot move
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
! exit 1; \
! fi; \
fi; \
! else \
! echo "msgmerge for $$lang.po failed!" 1>&2; \
! rm -f $$tmpdir/$$lang.new.po; \
! fi
!
! $(DUMMYPOFILES):
update-gmo: Makefile $(GMOFILES)
***************
*** 191,194 ****
--- 310,315 ----
&& CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
$(SHELL) ./config.status
+
+ force:
# Tell versions [3.59,3.63) of GNU make not to export all variables.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- CVS: a2ps/po Makefile.in.in,1.3,1.4,
Akim Demaille <address@hidden> <=