[w3m-dev 04063] about Makefile

1.  scripts/multipart 

    # cd scripts/multipart
    # make install

   Makefile  LIB_DIR 
  LIB_DIR  CGIBIN_DIR
  

2. make clean  w3mimg/w3mimg.a 

3. make distclean 
  rm  -f 
  



-- 
  (E-mail: [email protected])


Index: Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/Makefile.in,v
retrieving revision 1.36
diff -u -r1.36 Makefile.in
--- Makefile.in	4 Apr 2004 16:47:20 -0000	1.36
+++ Makefile.in	7 Apr 2004 05:32:03 -0000
@@ -39,7 +39,7 @@
 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 @@
 
 MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
 	BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
-	LIB_DIR='$(CGIBIN_DIR)' \
+	CGIBIND_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 @@
 	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:
Index: config.h.dist
===================================================================
RCS file: /cvsroot/w3m/w3m/config.h.dist,v
retrieving revision 1.35
diff -u -r1.35 config.h.dist
--- config.h.dist	22 Sep 2003 21:02:16 -0000	1.35
+++ config.h.dist	7 Apr 2004 05:32:03 -0000
@@ -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 @@
 #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"
Index: indep.c
===================================================================
RCS file: /cvsroot/w3m/w3m/indep.c,v
retrieving revision 1.34
diff -u -r1.34 indep.c
--- indep.c	26 Jul 2003 17:16:24 -0000	1.34
+++ indep.c	7 Apr 2004 05:32:03 -0000
@@ -723,7 +723,7 @@
 char *
 w3m_lib_dir()
 {
-    return w3m_dir("W3M_LIB_DIR", LIB_DIR);
+    return w3m_dir("W3M_LIB_DIR", CGIBIN_DIR);
 }
 
 char *
Index: scripts/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/scripts/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- scripts/Makefile.in	21 Mar 2004 16:07:02 -0000	1.7
+++ scripts/Makefile.in	7 Apr 2004 05:32:03 -0000
@@ -81,7 +81,7 @@
 
 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 @@
 	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 \
@@ -107,7 +107,7 @@
 	done
 	-for file in $(LIB_TARGETS); \
 	do      \
-		rm -f $(LIB_DIR)/$$file; \
+		rm -f $(CGIBIN_DIR)/$$file; \
 	done
 	-for file in w3mhelp-*.pl; \
 	do \
Index: scripts/multipart/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/scripts/multipart/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- scripts/multipart/Makefile.in	21 Mar 2004 16:07:02 -0000	1.3
+++ scripts/multipart/Makefile.in	7 Apr 2004 05:32:03 -0000
@@ -47,16 +47,16 @@
 $(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:
Index: w3mimg/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/w3mimg/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- w3mimg/Makefile.in	21 Mar 2004 16:01:39 -0000	1.8
+++ w3mimg/Makefile.in	7 Apr 2004 05:32:03 -0000
@@ -30,14 +30,14 @@
 	@-$(RM) -f *.o
 	@for dir in fb x11; do \
 		(cd $$dir && $(MAKE) clean RM=$(RM)); \
-	 done
+	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