diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-09 08:03:55 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-09 08:03:55 +0000 |
| commit | 02b8280916dd8a31edfe281dfffe42d183c776bc (patch) | |
| tree | 2f73e8bb9925c1576d82f445408def8aa32d4f6c /libcpp | |
| parent | 1ec4ef31e646fb3af1066d4b50be4d072ebb5d2f (diff) | |
| download | gcc-02b8280916dd8a31edfe281dfffe42d183c776bc.tar.gz | |
2009-01-09 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r143197
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@143199 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/Makefile.in | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index a6378bc339c..9786f72b463 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2009-01-05 Ben Elliston <bje@au.ibm.com> + + * Makefile.in (.po.gmo): Use mkinstalldirs, not test -d || mkdir. + (.po.pox): Likewise. + (po/$(PACKAGE).pot): Likewise. + 2008-12-10 Alexandre Oliva <aoliva@redhat.com> PR target/37033 diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in index 74877bbd982..2d82ebdd8b3 100644 --- a/libcpp/Makefile.in +++ b/libcpp/Makefile.in @@ -220,7 +220,7 @@ endif # N.B. We do not attempt to copy these into $(srcdir). .po.gmo: - -test -d po || mkdir po + $(mkinstalldirs) po $(GMSGFMT) --statistics -o $@ $< # The new .po has to be gone over by hand, so we deposit it into @@ -228,7 +228,7 @@ endif # If build/po/$(PACKAGE).pot exists, use it (it was just created), # else use the one in srcdir. .po.pox: - -test -d po || mkdir po + $(mkinstalldirs) po $(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \ then echo po/$(PACKAGE).pot; \ else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@ @@ -236,7 +236,7 @@ endif # Rule for regenerating the message template. $(PACKAGE).pot: po/$(PACKAGE).pot po/$(PACKAGE).pot: $(libcpp_a_SOURCES) - -test -d $(srcdir)/po || mkdir $(srcdir)/po + mkinstalldirs $(srcdir)/po $(XGETTEXT) --default-domain=$(PACKAGE) \ --keyword=_ --keyword=N_ \ --keyword=cpp_error:3 --keyword=cpp_errno:3 \ |