[Adonthell-commits] CVS: adonthell/po ChangeLog,1.2,1.3 Makefile.in.in,1.3,1.4

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/po
In directory subversions:/tmp/cvs-serv14482/po

Modified Files:
        ChangeLog Makefile.in.in 
Log Message:
UPDATED to gettext 0.11.1
FIXED src/Makefile.am


Index: ChangeLog
===================================================================
RCS file: /cvsroot/adonthell/adonthell/po/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ChangeLog   7 Apr 2002 09:51:28 -0000       1.2
--- ChangeLog   15 Apr 2002 13:02:35 -0000      1.3
***************
*** 1,2 ****
--- 1,7 ----
+ 2002-04-15  gettextize  <address@hidden>
+ 
+       * Makefile.in.in: Upgrade to gettext-0.11.1.
+       * remove-potcdate.sin: New file, from gettext-0.11.1.
+ 
  2002-03-15  gettextize  <address@hidden>
  

Index: Makefile.in.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/po/Makefile.in.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in.in      9 Apr 2002 10:30:25 -0000       1.3
--- Makefile.in.in      15 Apr 2002 13:02:35 -0000      1.4
***************
*** 17,21 ****
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
- top_builddir = @top_builddir@
  VPATH = @srcdir@
  
--- 17,20 ----
***************
*** 44,48 ****
  UPDATEPOFILES = @UPDATEPOFILES@
  DUMMYPOFILES = @DUMMYPOFILES@
! DISTFILES.common = Makefile.in.in Makevars \
  $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) 
$(DISTFILES.common.extra3)
  DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
--- 43,47 ----
  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 \
***************
*** 57,64 ****
  
  .SUFFIXES:
! .SUFFIXES: .po .gmo .mo .nop .po-update
  
  .po.mo:
!       $(MSGFMT) -c -o $@ $<
  
  .po.gmo:
--- 56,64 ----
  
  .SUFFIXES:
! .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
  
  .po.mo:
!       @echo "$(MSGFMT) -c -o $@ $<"; \
!       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
  
  .po.gmo:
***************
*** 66,70 ****
        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 
$${lang}.gmo $${lang}.po
  
  
--- 66,74 ----
        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,89 ****
  # have been downloaded.
  
! $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
        $(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 \
!          || ( rm -f $(srcdir)/$(DOMAIN).pot \
!               && mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot )
  
  $(srcdir)/$(DOMAIN).pot:
--- 82,104 ----
  # 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:
***************
*** 224,228 ****
  
  mostlyclean:
!       rm -f core core.* $(DOMAIN).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