diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-11-09 20:50:00 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-11-09 20:50:00 +0000 |
| commit | dfbc5c675186a93615fa02c45ba33c89e750ddd0 (patch) | |
| tree | aea234f482a581399a43f909114c9d38b7a8de1c | |
| parent | 21259580f688c6a80cf31fb54a280df149dde6b1 (diff) | |
| download | nautilus-dfbc5c675186a93615fa02c45ba33c89e750ddd0.tar.gz | |
Turns out it can be even simpler. There's no need to generate the headers
* Makefile.i18npatch: Turns out it can be even simpler. There's
no need to generate the headers when making the POTFILE.
* .cvsignore: No need to ignore "headers" any more.
| -rw-r--r-- | po/.cvsignore | 1 | ||||
| -rw-r--r-- | po/ChangeLog | 6 | ||||
| -rw-r--r-- | po/Makefile.i18npatch | 21 |
3 files changed, 11 insertions, 17 deletions
diff --git a/po/.cvsignore b/po/.cvsignore index 0cd43e1ac..27c09646a 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -5,7 +5,6 @@ Makefile.in Makefile.in.in POTFILES cat-id-tbl.c -headers messages nautilus.pot stamp-cat-id diff --git a/po/ChangeLog b/po/ChangeLog index 0b8e69981..abf67ee9e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,5 +1,11 @@ 2000-11-09 Darin Adler <darin@eazel.com> + * Makefile.i18npatch: Turns out it can be even simpler. There's + no need to generate the headers when making the POTFILE. + * .cvsignore: No need to ignore "headers" any more. + +2000-11-09 Darin Adler <darin@eazel.com> + * Makefile.i18npatch: Fixed the patch so it will apply successfully. Also fixed a small problem that leads to an infinite loop when building. diff --git a/po/Makefile.i18npatch b/po/Makefile.i18npatch index 9bea55042..553796017 100644 --- a/po/Makefile.i18npatch +++ b/po/Makefile.i18npatch @@ -1,17 +1,16 @@ --- Makefile.in.in.clean Thu Nov 9 11:09:02 2000 -+++ Makefile.in.in Thu Nov 9 12:21:17 2000 -@@ -33,7 +33,9 @@ ++++ Makefile.in.in Thu Nov 9 12:48:26 2000 +@@ -33,7 +33,8 @@ GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../src:$$PATH msgmerge +MSGMERGE = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --dist +GENPOT = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --pot -+GENHEAD = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --headers DEFS = @DEFS@ CFLAGS = @CFLAGS@ -@@ -47,7 +49,7 @@ +@@ -47,7 +48,7 @@ POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ @@ -20,7 +19,7 @@ POTFILES = \ -@@ -83,12 +85,7 @@ +@@ -83,12 +84,7 @@ all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) @@ -34,7 +33,7 @@ $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot -@@ -214,18 +211,21 @@ +@@ -214,13 +210,12 @@ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ @@ -50,13 +49,3 @@ mv $$lang.old.po $$lang.po; \ fi; \ done - --POTFILES: POTFILES.in -+headers: POTFILES.in -+ $(GENHEAD) -+ touch headers -+ -+POTFILES: POTFILES.in headers - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ |