From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 29 Sep 1998 06:57:01 +0000 (+0000)
Subject: patch-0.94.7i.rr.charsets_fix.1, from Roland Rosenfeld.
X-Git-Tag: mutt-0-94-9i-rel~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12cc52314fee4a83540896a9b81cec32ff808f7b;p=mutt

patch-0.94.7i.rr.charsets_fix.1, from Roland Rosenfeld.
---

diff --git a/Makefile.in b/Makefile.in
index 4f8413f3..ddad5346 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ NONEXPORT=pgp.c pgp.h pgpinvoke.c pgpkey.c pgppubring.c sha.h sha1dgst.c \
 	gnupgparse.c sha_locl.h OPS.PGP doc/pgp-Notes.txt doc/language.txt \
 	doc/language50.txt
 
-all: mutt @DOTLOCK_TARGET@ 
+all: mutt @DOTLOCK_TARGET@ charsets/charsets.list
 
 mutt: keymap_defs.h $(OBJS) $(REGEX)
 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
@@ -65,6 +65,9 @@ mutt: keymap_defs.h $(OBJS) $(REGEX)
 dotlock: dotlock.o @SNPRINTFOBJS@
 	$(CC) -o dotlock dotlock.o @SNPRINTFOBJS@
 
+charsets/charsets.list:
+	( cd $(srcdir)/charsets &&  $(MAKE) charsets.list)
+
 keymap_defs.h: Makefile $(OPS)
 	rm -f keymap_defs.h
 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
@@ -127,6 +130,7 @@ clean:
 
 veryclean:
 	rm -f $(VERYCLEANFILES)
+	(cd $(srcdir)/charsets && $(MAKE) $@)
 
 distclean:
 	(cd $(srcdir) && rm -f $(DISTCLEANFILES))
diff --git a/charsets/Makefile.in b/charsets/Makefile.in
index 11da4bed..5755c10d 100644
--- a/charsets/Makefile.in
+++ b/charsets/Makefile.in
@@ -19,20 +19,23 @@
 SHELL=/bin/sh
 sharedir=@sharedir@
 CC=@CC@
-CFLAGS=@CFLAGS@
+CFLAGS=@CFLAGS@ -D_GEN_CHARSETS
 LDFLAGS=@LDFLAGS@
 srcdir=@srcdir@
 VPATH=@srcdir@
 @SET_MAKE@
 INSTALL=@INSTALL@
 
+charsets.list: parse_i18n
+	sh gen_charsets
+
 parse_i18n: parse_i18n.o
 	$(CC) -o parse_i18n parse_i18n.o
 
 clean:
 	-rm -f *.o *~ core parse_i18n
 
-distclean: clean
+distclean: clean veryclean
 	-rm -f Makefile
 
 veryclean:
diff --git a/charsets/gen_charsets b/charsets/gen_charsets
index 00fae06f..5ae2d6a7 100755
--- a/charsets/gen_charsets
+++ b/charsets/gen_charsets
@@ -4,6 +4,8 @@ dirs="/usr/local/lib/nls /usr/lib/nls /usr/local/share/nls /usr/share/nls"
 dirs="$dirs /usr/local/lib/i18n /usr/lib/i18n /usr/local/share/i18n"
 dirs="$dirs /usr/share/i18n"
 
+trap "rm -f ./charsets.$$; exit" 0 1 2 15
+
 rm -f ./charsets.list ./charsets.alias ./charsets.$$
 
 for d in $dirs ; do
diff --git a/charsets/parse_i18n.c b/charsets/parse_i18n.c
index e4c148dc..89502f93 100644
--- a/charsets/parse_i18n.c
+++ b/charsets/parse_i18n.c
@@ -21,8 +21,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#define _GEN_CHARSETS
-
 #include "../charset.h"
 
 #if 0