Remove mutt_ssl_nss.c from POTFILES.in. Also hack the makefiles to

build keymap_alldefs.h in $(top_srcdir), since that's where xgettext
looks. Not super clean I guess - the other alternative is to sed
POTFILES.

diff --git a/Makefile.am b/Makefile.am
index a94f4e1b25b821663745c74058ddb2b7f1c41e15..7457668486bcd61cba5052a2a2ecfcb43f37b7e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,7 @@ keymap_defs.h: $(OPS) $(srcdir)/gen_defs
 keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
        $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
-                       > keymap_alldefs.h
+                       > $(srcdir)/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 517e9c02c9a60bcb5fe6b5097b24b7df352f6833..a8d897c55a59237113ee1f6e9e54becf3216058d 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -77,8 +77,8 @@ all: all-@USE_NLS@
 all-yes: $(CATALOGS)
 all-no:
 
-.PHONY: ../keymap_alldefs.h
-../keymap_alldefs.h:
+.PHONY: $(top_srcdir)/keymap_alldefs.h
+$(top_srcdir)/keymap_alldefs.h:
        cd .. && $(MAKE) keymap_alldefs.h
 
 # Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ee8c9c6e4a4a1a3a25ec1d57c857b26580b6e4a..828fb37c2ed42df889ed78cf88cb293379a98b5c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,7 +42,6 @@ mh.c
 mutt_socket.c
 mutt_ssl.c
 mutt_ssl_gnutls.c
-mutt_ssl_nss.c
 mutt_tunnel.c
 muttlib.c
 mx.c