[w3m-dev 03406]

* scripts/Makefile: add AUXBIN_DIR
		update LIB_DIR, HELP_DIR
		xface2xpm installed in AUXBIN_DIR
* scripts/multipart/Makefile: update LIB_DIR
* scripts/w3mman/Makefile: update LIB_DIR
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-11 15:19:49 +00:00
parent df6ec62bf2
commit 8f129fd737
4 changed files with 32 additions and 13 deletions

View File

@@ -1,3 +1,12 @@
2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03406]
* scripts/Makefile: add AUXBIN_DIR
update LIB_DIR, HELP_DIR
xface2xpm installed in AUXBIN_DIR
* scripts/multipart/Makefile: update LIB_DIR
* scripts/w3mman/Makefile: update LIB_DIR
2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> 2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03405] Re: tab browser * [w3m-dev 03405] Re: tab browser
@@ -4496,4 +4505,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.494 2002/11/11 15:16:37 ukai Exp $ $Id: ChangeLog,v 1.495 2002/11/11 15:19:49 ukai Exp $

View File

@@ -2,12 +2,14 @@
prefix = /usr/local prefix = /usr/local
DESTDIR = DESTDIR =
BIN_DIR = $(prefix)/bin BIN_DIR = $(prefix)/bin
LIB_DIR = $(prefix)/lib/w3m AUXBIN_DIR = $(prefix)/lib/w3m
HELP_DIR = $(prefix)/lib/w3m LIB_DIR = $(prefix)/lib/w3m/cgi-bin
HELP_DIR = $(prefix)/share/w3m
RC_DIR = ~/.w3m RC_DIR = ~/.w3m
LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi xface2xpm AUXBIN_TARGETS = xface2xpm
HELP_LIBS = w3mhelp-funcname.pl w3mhelp-funcdesc.pl LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi
HELP_TARGETS = w3mhelp-funcname.pl w3mhelp-funcdesc-stamp
MKDIR = mkdir -p MKDIR = mkdir -p
INSTALL = install -c INSTALL = install -c
@@ -20,7 +22,7 @@ DOCDIRS = doc:en_English doc-jp:ja_Japanese
.SUFFIXES: .in .SUFFIXES: .in
all: $(LIB_TARGETS) $(HELP_LIBS) all: $(LIB_TARGETS) $(HELP_TARGETS)
.in: .in:
@echo "generating $@..." @echo "generating $@..."
@@ -42,8 +44,7 @@ w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab ../doc/keymap.defaul
@cat w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl @cat w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl
@echo "done" @echo "done"
w3mhelp-funcdesc.pl: w3mhelp-funcdesc-stamp w3mhelp-funcdesc-stamp: ../doc/README.func ../doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in
w3mhelp-funcdesc-stamp:
@echo "generating w3mhelp-funcdesc*.pl..." @echo "generating w3mhelp-funcdesc*.pl..."
@for dirlang in $(DOCDIRS); do \ @for dirlang in $(DOCDIRS); do \
dir=`expr "$$dirlang" : "\(.*\):.*"`; \ dir=`expr "$$dirlang" : "\(.*\):.*"`; \
@@ -54,11 +55,16 @@ w3mhelp-funcdesc-stamp:
cat w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \ cat w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \
done done
@echo done @echo done
touch w3mhelp-funcdesc-stamp @touch w3mhelp-funcdesc-stamp
install: $(LIB_TARGETS) $(HELP_LIBS) install: $(LIB_TARGETS) $(HELP_TARGETS)
-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
-$(MKDIR) $(DESTDIR)$(LIB_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR)
for file in $(AUXBIN_TARGETS); \
do \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(AUXBIN_DIR); \
done
for file in $(LIB_TARGETS); \ for file in $(LIB_TARGETS); \
do \ do \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \
@@ -69,6 +75,10 @@ install: $(LIB_TARGETS) $(HELP_LIBS)
done done
uninstall: uninstall:
-for file in $(AUXBIN_TARGETS); \
do \
rm -f $(AUXBIN_DIR)/$$file; \
done
-for file in $(LIB_TARGETS); \ -for file in $(LIB_TARGETS); \
do \ do \
rm -f $(LIB_DIR)/$$file; \ rm -f $(LIB_DIR)/$$file; \
@@ -79,4 +89,4 @@ uninstall:
done done
clean: clean:
-rm -f $(LIB_TARGETS) w3mhelp-*.pl *-stamp -rm -f $(LIB_TARGETS) $(HELP_TARGETS) w3mhelp-*.pl

View File

@@ -1,7 +1,7 @@
prefix = /usr/local prefix = /usr/local
BIN_DIR = $(prefix)/bin BIN_DIR = $(prefix)/bin
LIB_DIR = $(prefix)/lib/w3m LIB_DIR = $(prefix)/lib/w3m/cgi-bin
DESTDIR = DESTDIR =
distdir = ./distfiles distdir = ./distfiles

View File

@@ -1,7 +1,7 @@
prefix = /usr/local prefix = /usr/local
BIN_DIR = $(prefix)/bin BIN_DIR = $(prefix)/bin
LIB_DIR = $(prefix)/lib/w3m LIB_DIR = $(prefix)/lib/w3m/cgi-bin
MAN_DIR = $(prefix)/man MAN_DIR = $(prefix)/man
MAN1_DIR = $(MAN_DIR)/man1 MAN1_DIR = $(MAN_DIR)/man1
DESTDIR = DESTDIR =