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

diff --git a/Makefile.am b/Makefile.am
index 670e3e7ddbdba59c53049326706deae1769049ca..5f2cb830ad384c63517bc7f6ac28395a2c61e370 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,12 +114,11 @@ smime_keys: $(srcdir)/smime_keys.pl
 keymap_defs.h: $(OPS) $(srcdir)/gen_defs
        $(srcdir)/gen_defs $(OPS) > keymap_defs.h
 
-$(srcdir)/keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
-       chmod u+w $(srcdir)
+keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
        rm -f $@
        $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
-                       > $(srcdir)/keymap_alldefs.h
+                       > keymap_alldefs.h
 
 reldate.h: $(srcdir)/ChangeLog
        echo 'const char *ReleaseDate = "'`head -n 1 $(srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1`'";' > reldate.h.tmp; \

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 196ce271d714668f6bff0e1433302ef28384fc2f..0cf0fe74b5ff605b76c0356cdcff0cc8d0756a9d 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -51,6 +51,10 @@ GMOFILES = @GMOFILES@
 DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
 $(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 = \
 
 CATALOGS = @CATALOGS@
@@ -78,19 +82,22 @@ all: all-@USE_NLS@
 all-yes: $(CATALOGS)
 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',
 # otherwise packages like GCC can not be built if only parts of the source
 # 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 \
                && mv $(PACKAGE).po $(PACKAGE).pot )

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1d7d3688d12933b000ca71d7aa939e341eca043..2d01add62fe1a3ee7a7639603f67e2d83fcf2765 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,7 +34,6 @@ imap/message.c
 imap/util.c
 init.c
 keymap.c
-keymap_alldefs.h
 lib.c
 main.c
 mbox.c