diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | config.h.dist | 4 | ||||
| -rw-r--r-- | indep.c | 5 | ||||
| -rw-r--r-- | scripts/Makefile.in | 4 | ||||
| -rw-r--r-- | scripts/multipart/Makefile.in | 6 | ||||
| -rw-r--r-- | w3mimg/Makefile.in | 2 |
7 files changed, 32 insertions, 19 deletions
@@ -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> * [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 * 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 $ diff --git a/Makefile.in b/Makefile.in index f9bdcf8..b794b43 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,7 +39,7 @@ CFLAGS = $(OPTS) @CFLAGS@ $(CPPFLAGS) $(DEFS) WCCFLAGS = @WCCFLAGS@ CPPFLAGS = @CPPFLAGS@ 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)\" \ -DRC_DIR=\"$(RC_DIR)\" \ -DLOCALEDIR=\"$(localedir)\" @@ -51,7 +51,7 @@ NLSTARGET = @NLSTARGET@ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \ 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)' \ CONF_DIR='$(CONF_DIR)' \ RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)' @@ -292,12 +292,12 @@ distclean: clean do \ (cd $$subdir && $(MAKE) distclean); \ done - -$(RM) config.cache config.log config.status - -$(RM) w3mhelp-w3m_en.html w3mhelp-w3m_ja.html - -$(RM) w3mhelp-lynx_en.html w3mhelp-lynx_ja.html - -$(RM) version.c - -$(RM) posubst - -$(RM) config.h Makefile + -$(RM) -f config.cache config.log config.status + -$(RM) -f w3mhelp-w3m_en.html w3mhelp-w3m_ja.html + -$(RM) -f w3mhelp-lynx_en.html w3mhelp-lynx_ja.html + -$(RM) -f version.c + -$(RM) -f posubst + -$(RM) -f config.h Makefile -$(RM) -f *core sweep: diff --git a/config.h.dist b/config.h.dist index d3e9102..844a555 100644 --- a/config.h.dist +++ b/config.h.dist @@ -71,7 +71,7 @@ BIN_DIR = /usr/local/bin 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 MAN_DIR = /usr/local/man 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 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 ETC_DIR "/usr/local/etc/w3m" #define HELP_FILE "w3mhelp.html" @@ -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 <stdio.h> #include <pwd.h> @@ -723,7 +723,8 @@ w3m_auxbin_dir() char * 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 * diff --git a/scripts/Makefile.in b/scripts/Makefile.in index a1d549b..c90ab2e 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -81,7 +81,7 @@ $(SUBDIRS): install: $(LIB_TARGETS) $(HELP_TARGETS) -$(MKDIR) $(DESTDIR)$(AUXBIN_DIR) - -$(MKDIR) $(DESTDIR)$(LIB_DIR) + -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR) for file in $(AUXBIN_TARGETS); \ do \ @@ -89,7 +89,7 @@ install: $(LIB_TARGETS) $(HELP_TARGETS) done for file in $(LIB_TARGETS); \ do \ - $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ + $(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR); \ done for file in w3mhelp-*.pl; \ do \ diff --git a/scripts/multipart/Makefile.in b/scripts/multipart/Makefile.in index cd6bcc9..ad472ee 100644 --- a/scripts/multipart/Makefile.in +++ b/scripts/multipart/Makefile.in @@ -47,16 +47,16 @@ all: $(LIB_TARGETS) $(LIB_TARGETS): install: $(LIB_TARGETS) - -$(MKDIR) $(DESTDIR)$(LIB_DIR) + -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR) for file in $(LIB_TARGETS); \ do \ - $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ + $(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR); \ done uninstall: -for file in $(LIB_TARGETS); \ do \ - rm -f $(LIB_DIR)/$$file; \ + rm -f $(CGIBIN_DIR)/$$file; \ done clean: diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in index 3d22511..7c70164 100644 --- a/w3mimg/Makefile.in +++ b/w3mimg/Makefile.in @@ -31,13 +31,13 @@ clean: @for dir in fb x11; do \ (cd $$dir && $(MAKE) clean RM=$(RM)); \ done + -$(RM) -f w3mimg.a distclean: clean for subdir in fb x11; \ do \ (cd $$subdir && $(MAKE) distclean); \ done - -$(RM) -f w3mimg.a -$(RM) -f Makefile |