summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-11-09 21:58:43 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-11-09 21:58:43 +0000
commit34ae664db963527aa29ec835cd4a6d7af546505e (patch)
tree97bd62a86b08979af367ec19d16f78eeb2c3cca4 /libcpp
parent4b844e7e04a8be54cd93c0621da1493863ca1b02 (diff)
downloadgcc-34ae664db963527aa29ec835cd4a6d7af546505e.tar.gz
* Makefile.in ($(PACKAGE).pot): New rule. Depend on
po/$(PACKAGE).pot. (po/$(PACKAGE).pot): Use ":" instead of "," in --keyword arguments. Add keywords _, N_, SYNTAX_ERROR and SYNTAX_ERROR2. Remove local srcdir path from generated file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90368 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog8
-rw-r--r--libcpp/Makefile.in11
2 files changed, 16 insertions, 3 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 85fa04f7038..5a461498767 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-09 Joseph S. Myers <joseph@codesourcery.com>
+
+ * Makefile.in ($(PACKAGE).pot): New rule. Depend on
+ po/$(PACKAGE).pot.
+ (po/$(PACKAGE).pot): Use ":" instead of "," in --keyword
+ arguments. Add keywords _, N_, SYNTAX_ERROR and SYNTAX_ERROR2.
+ Remove local srcdir path from generated file.
+
2004-11-04 Zack Weinberg <zack@codesourcery.com>
Gerald Pfeifer <gerald@pfeifer.com>
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index bd1861c9b4a..8a7a4898365 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -207,14 +207,19 @@ update-po: $(CATALOGS:.gmo=.pox)
else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@
# Rule for regenerating the message template.
+$(PACKAGE).pot: po/$(PACKAGE).pot
po/$(PACKAGE).pot: $(libcpp_a_SOURCES)
-test -d $(srcdir)/po || mkdir $(srcdir)/po
$(XGETTEXT) --default-domain=$(PACKAGE) \
- --keyword=cpp_error,3 --keyword=cpp_errno,3 \
- --keyword=cpp_error_with_line,5 \
+ --keyword=_ --keyword=N_ \
+ --keyword=cpp_error:3 --keyword=cpp_errno:3 \
+ --keyword=cpp_error_with_line:5 \
+ --keyword=SYNTAX_ERROR --keyword=SYNTAX_ERROR2 \
--copyright-holder="Free Software Foundation, Inc." \
--msgid-bugs-address="http://gcc.gnu.org/bugs.html" \
- --language=c -o po/$(PACKAGE).pot $^
+ --language=c -o po/$(PACKAGE).pot.tmp $^
+ sed 's:$(srcdir)/::g' <po/$(PACKAGE).pot.tmp >po/$(PACKAGE).pot
+ rm po/$(PACKAGE).pot.tmp
# Tell versions [3.59,3.63) of GNU make to not export all variables.