storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 04063] about Makefile

Browse Source 
* Makefile.in (DEFS): use CGIBIN_DIR instead of LIB_DIR
	(MAKE_ARGS): ditto
	(distclean): rm -f
* config.h.dist: use CGIBIN_DIR instead of LIB_DIR
* indep.c (w3m_lib_dir): ditto
* scripts/Makefile.in: ditto
* scripts/multipart/Makefile.in: ditto
* w3mimg/Makefile.in (clearn): remove w3mimg.a
From: SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
This commit is contained in:
Fumitoshi UKAI
2004-04-09 17:18:48 +00:00
parent 064337fd40
commit e4e1dd26a2
7 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,15 @@
2004-04-10 SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
* [w3m-dev 04063] about Makefile
* Makefile.in (DEFS): use CGIBIN_DIR instead of LIB_DIR
(MAKE_ARGS): ditto
(distclean): rm -f
* config.h.dist: use CGIBIN_DIR instead of LIB_DIR
* indep.c (w3m_lib_dir): ditto
* scripts/Makefile.in: ditto
* scripts/multipart/Makefile.in: ditto
* w3mimg/Makefile.in (clearn): remove w3mimg.a
2004-04-05 AIDA Shinra <shinra@j10n.org> 2004-04-05 AIDA Shinra <shinra@j10n.org>
* [w3m-dev 04049] w3m-cvs-1.914-misc.patch * [w3m-dev 04049] w3m-cvs-1.914-misc.patch
@@ -8394,4 +8406,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.917 2004/04/04 16:47:20 ukai Exp $ $Id: ChangeLog,v 1.918 2004/04/09 17:18:48 ukai Exp $

16
Makefile.in
View File

@@ -39,7 +39,7 @@ CFLAGS = $(OPTS) @CFLAGS@ $(CPPFLAGS) $(DEFS)
WCCFLAGS = @WCCFLAGS@ WCCFLAGS = @WCCFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \ DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
-DLIB_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \ -DCGIBIN_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
-DETC_DIR=\"$(ETC_DIR)\" -DCONF_DIR=\"$(CONF_DIR)\" \ -DETC_DIR=\"$(ETC_DIR)\" -DCONF_DIR=\"$(CONF_DIR)\" \
-DRC_DIR=\"$(RC_DIR)\" \ -DRC_DIR=\"$(RC_DIR)\" \
-DLOCALEDIR=\"$(localedir)\" -DLOCALEDIR=\"$(localedir)\"
@@ -51,7 +51,7 @@ NLSTARGET = @NLSTARGET@
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \ BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
LIB_DIR='$(CGIBIN_DIR)' \ CGIBIN_DIR='$(CGIBIN_DIR)' \
HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(ETC_DIR)' \ HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(ETC_DIR)' \
CONF_DIR='$(CONF_DIR)' \ CONF_DIR='$(CONF_DIR)' \
RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)' RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)'
@@ -292,12 +292,12 @@ distclean: clean
do \ do \
(cd $$subdir && $(MAKE) distclean); \ (cd $$subdir && $(MAKE) distclean); \
done done
-$(RM) config.cache config.log config.status -$(RM) -f config.cache config.log config.status
-$(RM) w3mhelp-w3m_en.html w3mhelp-w3m_ja.html -$(RM) -f w3mhelp-w3m_en.html w3mhelp-w3m_ja.html
-$(RM) w3mhelp-lynx_en.html w3mhelp-lynx_ja.html -$(RM) -f w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
-$(RM) version.c -$(RM) -f version.c
-$(RM) posubst -$(RM) -f posubst
-$(RM) config.h Makefile -$(RM) -f config.h Makefile
-$(RM) -f *core -$(RM) -f *core
sweep: sweep:

4
config.h.dist
View File

@@ -71,7 +71,7 @@
BIN_DIR = /usr/local/bin BIN_DIR = /usr/local/bin
AUXBIN_DIR = /usr/local/lib/w3m AUXBIN_DIR = /usr/local/lib/w3m
LIB_DIR = /usr/local/lib/w3m/cgi-bin CGIBIN_DIR = /usr/local/lib/w3m/cgi-bin
HELP_DIR = /usr/local/share/w3m HELP_DIR = /usr/local/share/w3m
MAN_DIR = /usr/local/man MAN_DIR = /usr/local/man
MAN1_DIR = $(MAN_DIR)/man1 MAN1_DIR = $(MAN_DIR)/man1
@@ -154,7 +154,7 @@ INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
#define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict" #define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict"
#define AUXBIN_DIR "/usr/local/lib/w3m" #define AUXBIN_DIR "/usr/local/lib/w3m"
#define LIB_DIR "/usr/local/lib/w3m/cgi-bin" #define CGIBIN_DIR "/usr/local/lib/w3m/cgi-bin"
#define HELP_DIR "/usr/local/lib/w3m" #define HELP_DIR "/usr/local/lib/w3m"
#define ETC_DIR "/usr/local/etc/w3m" #define ETC_DIR "/usr/local/etc/w3m"
#define HELP_FILE "w3mhelp.html" #define HELP_FILE "w3mhelp.html"

5
indep.c
View File

@@ -1,4 +1,4 @@
/* $Id: indep.c,v 1.34 2003/07/26 17:16:24 ukai Exp $ */ /* $Id: indep.c,v 1.35 2004/04/09 17:18:49 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <stdio.h> #include <stdio.h>
#include <pwd.h> #include <pwd.h>
@@ -723,7 +723,8 @@ w3m_auxbin_dir()
char * char *
w3m_lib_dir() w3m_lib_dir()
{ {
return w3m_dir("W3M_LIB_DIR", LIB_DIR); /* FIXME: use W3M_CGIBIN_DIR? */
return w3m_dir("W3M_LIB_DIR", CGIBIN_DIR);
} }
char * char *

4
scripts/Makefile.in
View File

@@ -81,7 +81,7 @@ $(SUBDIRS):
install: $(LIB_TARGETS) $(HELP_TARGETS) install: $(LIB_TARGETS) $(HELP_TARGETS)
-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR) -$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
-$(MKDIR) $(DESTDIR)$(LIB_DIR) -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR)
for file in $(AUXBIN_TARGETS); \ for file in $(AUXBIN_TARGETS); \
do \ do \
@@ -89,7 +89,7 @@ install: $(LIB_TARGETS) $(HELP_TARGETS)
done done
for file in $(LIB_TARGETS); \ for file in $(LIB_TARGETS); \
do \ do \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR); \
done done
for file in w3mhelp-*.pl; \ for file in w3mhelp-*.pl; \
do \ do \

6
scripts/multipart/Makefile.in
View File

@@ -47,16 +47,16 @@ all: $(LIB_TARGETS)
$(LIB_TARGETS): $(LIB_TARGETS):
install: $(LIB_TARGETS) install: $(LIB_TARGETS)
-$(MKDIR) $(DESTDIR)$(LIB_DIR) -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
for file in $(LIB_TARGETS); \ for file in $(LIB_TARGETS); \
do \ do \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR); \
done done
uninstall: uninstall:
-for file in $(LIB_TARGETS); \ -for file in $(LIB_TARGETS); \
do \ do \
rm -f $(LIB_DIR)/$$file; \ rm -f $(CGIBIN_DIR)/$$file; \
done done
clean: clean:

2
w3mimg/Makefile.in
View File

@@ -31,13 +31,13 @@ clean:
@for dir in fb x11; do \ @for dir in fb x11; do \
(cd $$dir && $(MAKE) clean RM=$(RM)); \ (cd $$dir && $(MAKE) clean RM=$(RM)); \
done done
-$(RM) -f w3mimg.a
distclean: clean distclean: clean
for subdir in fb x11; \ for subdir in fb x11; \
do \ do \
(cd $$subdir && $(MAKE) distclean); \ (cd $$subdir && $(MAKE) distclean); \
done done
-$(RM) -f w3mimg.a
-$(RM) -f Makefile -$(RM) -f Makefile