2009-11-21 Robert Millan <rmh.grub@aybabtu.com>

        Fix build for srcdir != objdir.

        * Makefile.in (po/$(PACKAGE).pot): Rename to ...
        ($(srcdir)/po/$(PACKAGE).pot): ... this.  Run $(XGETTEXT) from
        $(srcdir).
        ($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
        ($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
        reference for input.

diff --git a/ChangeLog b/ChangeLog
index 64ea5f7b8ca218740059ff4fb18e2d8c9956ad90..42ab8b8b62f269c8eac257b35832e7e2ccead682 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Fix build for srcdir != objdir.
+
+       * Makefile.in (po/$(PACKAGE).pot): Rename to ...
+       ($(srcdir)/po/$(PACKAGE).pot): ... this.  Run $(XGETTEXT) from
+       $(srcdir).
+       ($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
+       ($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
+       reference for input.
+
 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
 
        * util/grub-mkrescue.in: Use source directory direcly (without copiing

diff --git a/Makefile.in b/Makefile.in
index 43528c534afbc79c1160f7176a5c1cb3ba55300c..edc6c3853d216c4cdb195e28a105cdfe2eb40eed 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -472,12 +472,12 @@ gensymlist.sh: gensymlist.sh.in config.status
 genkernsyms.sh: genkernsyms.sh.in config.status
        $(SHELL) ./config.status
 
-po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-       $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_
-       $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
+$(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
+       cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_
+       cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
 
-$(foreach lang, $(LINGUAS), po/$(lang).po): po/$(PACKAGE).pot
-       $(MSGMERGE) -U $@ po/$(PACKAGE).pot
+$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
+       $(MSGMERGE) -U $@ $^
 
 po/%.mo: po/%.po
        $(MKDIR_P) $$(dirname $@)