diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | scripts/Makefile | 30 | ||||
| -rw-r--r-- | scripts/multipart/Makefile | 2 | ||||
| -rw-r--r-- | scripts/w3mman/Makefile | 2 |
4 files changed, 32 insertions, 13 deletions
@@ -1,5 +1,14 @@ 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> + * [w3m-dev 03405] Re: tab browser * main.c (moveTab): B_FORCE_REDRAW @@ -4496,4 +4505,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-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 $ diff --git a/scripts/Makefile b/scripts/Makefile index 5099918..18d51e5 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -2,12 +2,14 @@ prefix = /usr/local DESTDIR = BIN_DIR = $(prefix)/bin -LIB_DIR = $(prefix)/lib/w3m -HELP_DIR = $(prefix)/lib/w3m +AUXBIN_DIR = $(prefix)/lib/w3m +LIB_DIR = $(prefix)/lib/w3m/cgi-bin +HELP_DIR = $(prefix)/share/w3m RC_DIR = ~/.w3m -LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi xface2xpm -HELP_LIBS = w3mhelp-funcname.pl w3mhelp-funcdesc.pl +AUXBIN_TARGETS = xface2xpm +LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi +HELP_TARGETS = w3mhelp-funcname.pl w3mhelp-funcdesc-stamp MKDIR = mkdir -p INSTALL = install -c @@ -20,7 +22,7 @@ DOCDIRS = doc:en_English doc-jp:ja_Japanese .SUFFIXES: .in -all: $(LIB_TARGETS) $(HELP_LIBS) +all: $(LIB_TARGETS) $(HELP_TARGETS) .in: @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 @echo "done" -w3mhelp-funcdesc.pl: w3mhelp-funcdesc-stamp -w3mhelp-funcdesc-stamp: +w3mhelp-funcdesc-stamp: ../doc/README.func ../doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in @echo "generating w3mhelp-funcdesc*.pl..." @for dirlang in $(DOCDIRS); do \ dir=`expr "$$dirlang" : "\(.*\):.*"`; \ @@ -54,11 +55,16 @@ w3mhelp-funcdesc-stamp: cat w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \ 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)$(HELP_DIR) + for file in $(AUXBIN_TARGETS); \ + do \ + $(INSTALL_SCRIPT) $$file $(DESTDIR)$(AUXBIN_DIR); \ + done for file in $(LIB_TARGETS); \ do \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ @@ -69,6 +75,10 @@ install: $(LIB_TARGETS) $(HELP_LIBS) done uninstall: + -for file in $(AUXBIN_TARGETS); \ + do \ + rm -f $(AUXBIN_DIR)/$$file; \ + done -for file in $(LIB_TARGETS); \ do \ rm -f $(LIB_DIR)/$$file; \ @@ -79,4 +89,4 @@ uninstall: done clean: - -rm -f $(LIB_TARGETS) w3mhelp-*.pl *-stamp + -rm -f $(LIB_TARGETS) $(HELP_TARGETS) w3mhelp-*.pl diff --git a/scripts/multipart/Makefile b/scripts/multipart/Makefile index 5ee3fb6..d01b9a8 100644 --- a/scripts/multipart/Makefile +++ b/scripts/multipart/Makefile @@ -1,7 +1,7 @@ prefix = /usr/local BIN_DIR = $(prefix)/bin -LIB_DIR = $(prefix)/lib/w3m +LIB_DIR = $(prefix)/lib/w3m/cgi-bin DESTDIR = distdir = ./distfiles diff --git a/scripts/w3mman/Makefile b/scripts/w3mman/Makefile index a95f113..6bf7b4c 100644 --- a/scripts/w3mman/Makefile +++ b/scripts/w3mman/Makefile @@ -1,7 +1,7 @@ prefix = /usr/local BIN_DIR = $(prefix)/bin -LIB_DIR = $(prefix)/lib/w3m +LIB_DIR = $(prefix)/lib/w3m/cgi-bin MAN_DIR = $(prefix)/man MAN1_DIR = $(MAN_DIR)/man1 DESTDIR = |