]>
Commit | Line | Data |
---|---|---|
93f49f72 PG |
1 | --- ./Makefile.orig Sun Jul 29 16:17:38 2001 |
2 | +++ ./Makefile Sun Jul 29 16:38:53 2001 | |
3 | @@ -72,7 +72,7 @@ | |
4 | docsdir = $(prefix)/share/doc/$(Package) | |
5 | examplesdir = $(docsdir)/examples | |
6 | # charmaps_localdatadir must end in / | |
7 | -charmaps_localdatadir = /usr/local/share/i18n/charmaps/ | |
8 | +charmaps_localdatadir = /usr/share/i18n/charmaps/ | |
9 | man1dir = $(prefix)/man/man1 | |
10 | # for terminal initialization script | |
11 | sbindir = $(exec_prefix)/sbin | |
12 | @@ -90,7 +90,8 @@ | |
13 | WARN = -W -Wconversions -Wbad-function-cast | |
14 | ||
15 | CFLAGS = $(OPT) $(WARN) $(DEFS) -I$(ICONV_DIR)/include | |
16 | -LDFLAGS = -L$(ICONV_DIR)/lib -liconv | |
17 | +#LDFLAGS = -L$(ICONV_DIR)/lib/gconv -L$(ICONV_DIR)/lib -liconv | |
18 | +LDFLAGS = -L$(ICONV_DIR)/lib/gconv -L$(ICONV_DIR)/lib | |
19 | ||
20 | all: $(BIN) linux+utf8.ti | |
21 | ||
22 | @@ -266,13 +267,7 @@ | |
23 | if [ $${prefix##debian*}y != y ] ; \ | |
24 | then \ | |
25 | if ! tic -V 2>&1 |grep -q tconv; then \ | |
26 | - TERMINFO=; tic linux+utf8.ti; \ | |
27 | - test -e $(prefix)/share/terminfo/l/ || $(MKDIR) \ | |
28 | - $(prefix)/share/terminfo/l/; \ | |
29 | - cp /usr/share/terminfo/l/linux+utf8 \ | |
30 | - /usr/share/terminfo/l/linux-gr+utf8 \ | |
31 | - /usr/share/terminfo/l/linux+k \ | |
32 | - $(prefix)/share/terminfo/l/; \ | |
33 | + tic linux+utf8.ti; \ | |
34 | fi; \ | |
35 | fi; \ | |
36 | else \ |