diff options
author | Thomas Roessler <roessler@does-not-exist.org> | 1998-09-29 06:57:01 +0000 |
---|---|---|
committer | Thomas Roessler <roessler@does-not-exist.org> | 1998-09-29 06:57:01 +0000 |
commit | 12cc52314fee4a83540896a9b81cec32ff808f7b (patch) | |
tree | e7f01b72ba5b69d9d801647aa9bf07402ece6c5f /charsets | |
parent | 0037caa9a9a9b3732becd04fb6344f5192043597 (diff) |
patch-0.94.7i.rr.charsets_fix.1, from Roland Rosenfeld.
Diffstat (limited to 'charsets')
-rw-r--r-- | charsets/Makefile.in | 7 | ||||
-rwxr-xr-x | charsets/gen_charsets | 2 | ||||
-rw-r--r-- | charsets/parse_i18n.c | 2 |
3 files changed, 7 insertions, 4 deletions
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 |