[Graveman-cvs] Changes to graveman/current/po/Makefile.in.in

[sylvain cresto]

Index: graveman/current/po/Makefile.in.in
diff -u graveman/current/po/Makefile.in.in:1.2 
graveman/current/po/Makefile.in.in:1.3
--- graveman/current/po/Makefile.in.in:1.2      Sun Feb 13 04:59:01 2005
+++ graveman/current/po/Makefile.in.in  Sun Feb 20 17:45:02 2005
@@ -32,12 +32,10 @@
 gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
-install_sh = @install_sh@
-mkdir_p = @mkdir_p@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -46,8 +44,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) 
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) 
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --pot
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -60,7 +58,7 @@
 SOURCES = 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
 $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILES = \
@@ -77,13 +75,13 @@
 
 .po.pox:
        $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox
+       $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox
 
 .po.mo:
        $(MSGFMT) -o $@ $<
 
 .po.gmo:
-       file=`echo $* | sed 's,.*/,,'`.gmo \
+       file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
          && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
@@ -96,7 +94,7 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
        $(GENPOT)
 
 install: install-exec install-data
@@ -104,7 +102,7 @@
 install-data: address@hidden@
 install-data-no: all
 install-data-yes: all
-       if test -n "$(MKINSTALLDIRS)"; then \
+       if test -r "$(MKINSTALLDIRS)"; then \
          $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
        else \
          $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
@@ -118,7 +116,7 @@
          esac; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-         if test -n "$(MKINSTALLDIRS)"; then \
+         if test -r "$(MKINSTALLDIRS)"; then \
            $(MKINSTALLDIRS) $$dir; \
          else \
            $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
@@ -146,7 +144,7 @@
          fi; \
        done
        if test "$(PACKAGE)" = "glib"; then \
-         if test -n "$(MKINSTALLDIRS)"; then \
+         if test -r "$(MKINSTALLDIRS)"; then \
            $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
          else \
            $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
@@ -179,7 +177,7 @@
 dvi info tags TAGS ID:
 
 mostlyclean:
-       rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+       rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
        rm -fr *.o
        rm -f .intltool-merge-cache
 
@@ -194,7 +192,7 @@
        rm -f $(GMOFILES)
 
 distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot
+dist distdir: update-po $(DISTFILES)
        dists="$(DISTFILES)"; \
        for file in $$dists; do \
          ln $(srcdir)/$$file $(distdir) 2> /dev/null \
@@ -204,14 +202,14 @@
 update-po: Makefile
        $(MAKE) $(GETTEXT_PACKAGE).pot
        tmpdir=`pwd`; \
+       cd $(srcdir); \
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          echo "$$lang:"; \
-         result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-         if $$result; then \
-           if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; 
then \
+         if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) 
--dist -o $$tmpdir/$$lang.new.po $$lang; 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 \