Changeset 5296:84284776659e for po

Timestamp:

2007-11-07 05:54:48 (13 months ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Don't build keymap_alldefs.h in srcdir as it may be read-only

Location:

po

Files:

• Makefile.in.in (modified) (3 diffs)
• POTFILES.in (modified) (1 diff)

po/Makefile.in.in

@@ -52 +52 @@
 $(POFILES) $(GMOFILES)
 
+# need two spaces before = as m4/gettext.m4 matches against
+# 'POTFILES[space]=' to add files from POTFILES
+BUILT_POTFILES  = $(top_builddir)/keymap_alldefs.h
+
 POTFILES = \
 
@@ -79 +83 @@
 all-no:
 
-.PHONY: $(top_srcdir)/keymap_alldefs.h
-$(top_srcdir)/keymap_alldefs.h:
-        cd .. && $(MAKE) keymap_alldefs.h
+$(top_builddir)/keymap_alldefs.h:
+        ( cd $(top_builddir) && $(MAKE) keymap_alldefs.h )
 
 # Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
@@ -87 +90 @@
 # have been downloaded.
 
-$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
-        rm -f $@
+$(PACKAGE).pot: $(POTFILES) $(BUILT_POTFILES) $(srcdir)/POTFILES.in
+        rm -f $(PACKAGE).pot $(PACKAGE).po
         $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
           --add-comments --keyword=_ --keyword=N_ \
           --files-from=$(srcdir)/POTFILES.in \
+        && \
+        $(XGETTEXT) --default-domain=$(PACKAGE) \
+          --add-comments --keyword=_ --keyword=N_ \
+          --join $(BUILT_POTFILES) \
         && test ! -f $(PACKAGE).po \
            || ( rm -f $(PACKAGE).pot \

po/POTFILES.in

@@ -35 +35 @@
 init.c
 keymap.c
-keymap_alldefs.h
 lib.c
 main.c