A patch from Tommi Komulainen (and Lars Hecking) for building

outside the source directory.

diff --git a/Makefile.am b/Makefile.am
index a7aaa6e7a766f10f8146df7090c155bb40163368..81fce7835ad6a48837f2c64a44209388ac3a40a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,8 @@ pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
-CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc
+CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
+       keymap_alldefs.h keymap_defs.h
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -102,8 +103,8 @@ keymap.h: keymap_defs.h
 keymap_defs.h: $(OPS) $(srcdir)/gen_defs
        $(srcdir)/gen_defs $(OPS) > keymap_defs.h
 
-keymap_alldefs.h: OPS OPS.PGP OPS.MIX $(srcdir)/gen_defs
-       $(srcdir)/gen_defs OPS OPS.PGP OPS.MIX > keymap_alldefs.h
+keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/gen_defs
+       $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX > keymap_alldefs.h
 
 reldate:
        echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 24b058ac383bd4e3dc4ec00f7332295e64db6165..95b7067d8b7806fcf209989776e14a11eacc8a65 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -16,6 +16,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = ..
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -51,7 +52,7 @@ GMOFILES = @GMOFILES@
 DISTFILES = Makefile.in.in POTFILES.in $(srcdir)/$(PACKAGE).pot \
 stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
-POTFILES = \
+POTFILES = $(top_builddir)/keymap_alldefs.h \
 
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -84,9 +85,9 @@ all: all-@USE_NLS@
 all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
 
-.PHONY: ../keymap_alldefs.h
-../keymap_alldefs.h:
-       cd .. && $(MAKE) keymap_alldefs.h
+.PHONY: $(top_builddir)/keymap_alldefs.h
+$(top_builddir)/keymap_alldefs.h:
+       cd $(top_builddir) && $(MAKE) keymap_alldefs.h
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
        $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
@@ -232,14 +233,9 @@ update-po: Makefile
        done
 
 POTFILES: POTFILES.in
-       ( if test 'x$(srcdir)' != 'x.'; then \
-           posrcprefix='$(top_srcdir)/'; \
-         else \
-           posrcprefix="../"; \
-         fi; \
-         rm -f $@-t $@ \
+       (   rm -f $@-t $@ \
            && (sed -e '/^#/d' -e '/^[  ]*$$/d' \
-                   -e "s@.*@   $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+                   -e "s@.*@   $$(top_srcdir)& \\\\@" < $(srcdir)/$@.in \
                | sed -e '$$s/\\$$//') > $@-t \
            && chmod a-w $@-t \
            && mv $@-t $@ )

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67250c5def14ac719e4e24643865e366a30894bb..ee1af80d357f08585642cb1135727dcacfaf1f90 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,7 +27,6 @@ imap/socket.c
 imap/util.c
 init.c
 keymap.c
-keymap_alldefs.h
 lib.c
 lib.h
 main.c