aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--XMakefile15
2 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index cbce40e..386d7da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03428] install manual as w3m.exe.1 on Cygwin
+ * XMakefile (MAN1_TARGET): added
+ (HELP_TARGET): added
+ (install): use MAN1_TARGET, HELP_TARGET
+ (uninstall): use MAN1_TARGET, uninstall HELP_TARGET
+
+2002-11-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03427] Re: Select the nearest map area as default.
* map.c (newMapArea): accept sign chars
if points is not enough, return as SHAPE_UNKNOWN
@@ -4613,4 +4621,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.509 2002/11/13 15:51:39 ukai Exp $
+$Id: ChangeLog,v 1.510 2002/11/13 15:53:44 ukai Exp $
diff --git a/XMakefile b/XMakefile
index 899a0f5..bfd2dcb 100644
--- a/XMakefile
+++ b/XMakefile
@@ -1,4 +1,4 @@
-# $Id: XMakefile,v 1.32 2002/11/10 11:42:12 ukai Exp $
+# $Id: XMakefile,v 1.33 2002/11/13 15:53:45 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c image.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -19,9 +19,11 @@ BOOKMARKER=w3mbookmark$(EXT)
HELPER=w3mhelperpanel$(EXT)
INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT)
+MAN1_TARGET=w3m.1
MAN1=doc/w3m.1
MAN1_JA=doc-jp/w3m.1
TARGETS=$(TARGET) $(LIB_TARGETS) $(AUXBIN_TARGETS)
+HELP_TARGET=w3mhelp.html
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
@@ -127,9 +129,9 @@ install-core: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_JA_DIR)
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
- $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
- $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(TARGET).1
- $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(TARGET).1
+ $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET)
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(MAN1_TARGET)
+ $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(MAN1_TARGET)
for file in $(AUXBIN_TARGETS); \
do \
case $$file in \
@@ -177,8 +179,9 @@ uninstall:
do \
rm -f $(HELP_DIR)/$$file; \
done
- -rm -f $(MAN1_DIR)/$(TARGET).1
- -rm -f $(MAN1_JA_DIR)/$(TARGET).1
+ -rm -f $(HELP_DIR)/$(HELP_TARGET)
+ -rm -f $(MAN1_DIR)/$(MAN1_TARGET)
+ -rm -f $(MAN1_JA_DIR)/$(MAN1_TARGET)
-for dir in $(SCRIPTSUBDIRS); \
do \
(cd $$dir; $(MAKE) BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' uninstall); \