fix problem reported on [w3m-dev 03981]

  from Mamoru KOMACHI <usata@sodan.ecc.u-tokyo.ac.jp>
* configure.in: add AC_SUBST(HELP_DIR)
* Makefile.in (HELP_DIR): use AC_SUBT(HELP_DIR)
* scripts/Makefile.in: add PACKAGE, VERSION, DOMAIN
		use PACKAGE instead of package:
		 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
		add SUBDIRS
		(install unstall): do $(SUBDIRS)
* scripts/multipart/Makefile.in: add PACKAGE,VERSION,DOMAIN
		use PACKAGE instead of package:
		 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
* scripts/w3mman/Makefile.in: add PACKAGE,VERSION,DOMAIN
		use PACKAGE instead of package:
			 CGIBIN_DIR,AUXBIN_DIR,CONF_DIR
		add HELP_DIR
		add BIN_DIR, MAN1_DIR
		LIB_TARGETS->CGIBIN_TARGETS
		fix INSTALL_MAN

3 files changed, 63 insertions, 30 deletions

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index e033312..398dc96 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,5 +1,8 @@
 @SET_MAKE@
 SHELL=@SHELL@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+DOMAIN = $(PACKAGE)
 srcidr=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH= $(srcdir):.
@@ -22,17 +25,19 @@ top_srcdir = @top_srcdir@
 VPATH = $(srcdir):.
 DESTDIR = 
 
-CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
-AUXBIN_DIR = $(libexecdir)/$(package)
-HELP_DIR = $(datadir)/$(package)
-RC_DIR = ~/.$(package)
+CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin
+AUXBIN_DIR = $(libexecdir)/$(PACKAGE)
+HELP_DIR = @HELP_DIR@
+RC_DIR = @RC_DIR@
 ETC_DIR = $(sysconfdir)
-CONF_DIR = $(sysconfdir)/$(package)
+CONF_DIR = $(sysconfdir)/$(PACKAGE)
 DOCDIRS = @DOCDIRS@
 
 AUXBIN_TARGETS	= xface2xpm
 LIB_TARGETS	= dirlist.cgi w3mhelp.cgi w3mmail.cgi
 HELP_TARGETS	= w3mhelp-funcname.pl w3mhelp-funcdesc-stamp
+SUBDIRS = multipart w3mman
+.PHONY: $(SUBDIRS)
 
 MKDIR		= mkdir -p
 INSTALL		= @INSTALL@
@@ -41,7 +46,7 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 PERL		= @PERL@
 
-all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS)
+all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) $(SUBDIRS)
 
 w3mhelp-funcname.pl: w3mhelp-funcname.pl.in $(top_srcdir)/funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx
 	@echo "generating w3mhelp-funcname.pl..."
@@ -68,6 +73,12 @@ w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/READM
 	@echo done
 	@touch w3mhelp-funcdesc-stamp
 
+$(SUBDIRS):
+	for subdir in $(SUBDIRS); \
+	do \
+		(cd $$subdir && $(MAKE)); \
+	done
+
 install: $(LIB_TARGETS) $(HELP_TARGETS)
 	-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
@@ -84,6 +95,10 @@ install: $(LIB_TARGETS) $(HELP_TARGETS)
 	do \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR); \
 	done
+	for subdir in $(SUBDIRS); \
+	do \
+		(cd $$subdir && $(MAKE) install); \
+	done
 
 uninstall:
 	-for file in $(AUXBIN_TARGETS); \
@@ -98,17 +113,21 @@ uninstall:
 	do \
 		rm -f $(HELP_DIR)/$$file; \
 	done
+	-for subdir in $(SUBDIRS); \
+	do \
+		(cd $$subdir && $(MAKE) uninstall); \
+	done
 
 clean:
 	-rm -f $(HELP_TARGETS) w3mhelp-*.pl
-	-for dir in multipart w3mman; \
+	-for subdir in $(SUBDIRS); \
 	do \
-	  (cd $$dir && $(MAKE) clean); \
+	  (cd $$subdir && $(MAKE) clean); \
 	done
 
 distclean:
 	-rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) 
-	-for dir in multipart w3mman; \
+	-for subdir in $(SUBDIRS); \
 	do \
-	  (cd $$dir && $(MAKE) distclean); \
+	  (cd $$subdir && $(MAKE) distclean); \
 	done
diff --git a/scripts/multipart/Makefile.in b/scripts/multipart/Makefile.in
index e153264..269068a 100644
--- a/scripts/multipart/Makefile.in
+++ b/scripts/multipart/Makefile.in
@@ -1,5 +1,8 @@
 @SET_MAKE@
 SHELL=@SHELL@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+DOMAIN = $(PACKAGE)
 srcidr=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH= $(srcdir):.
@@ -22,12 +25,12 @@ top_srcdir = @top_srcdir@
 VPATH = $(top_srcdir):.
 DESTDIR = 
 
-CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
-AUXBIN_DIR = $(libexecdir)/$(package)
-HELP_DIR = $(datadir)/$(package)
-RC_DIR = ~/.$(package)
+CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin
+AUXBIN_DIR = $(libexecdir)/$(PACKAGE)
+HELP_DIR = @HELP_DIR@
+RC_DIR = @RC_DIR@
 ETC_DIR = $(sysconfdir)
-CONF_DIR = $(sysconfdir)/$(package)
+CONF_DIR = $(sysconfdir)/$(PACKAGE)
 
 LIB_TARGETS	= multipart.cgi
 
@@ -40,6 +43,9 @@ NKF		= @NKF@
 
 all: $(LIB_TARGETS)
 
+# do nothing
+$(LIB_TARGETS):
+
 install: $(LIB_TARGETS)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
 	for file in $(LIB_TARGETS);	\
diff --git a/scripts/w3mman/Makefile.in b/scripts/w3mman/Makefile.in
index c2c57e7..24a0a43 100644
--- a/scripts/w3mman/Makefile.in
+++ b/scripts/w3mman/Makefile.in
@@ -1,5 +1,8 @@
 @SET_MAKE@
 SHELL=@SHELL@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+DOMAIN = $(PACKAGE)
 srcidr=@srcdir@
 top_srcdir=@top_srcdir@
 VPATH= $(srcdir):.
@@ -22,36 +25,41 @@ top_srcdir = @top_srcdir@
 VPATH = $(top_srcdir):.
 DESTDIR = 
 
-CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
-AUXBIN_DIR = $(libexecdir)/$(package)
-HELP_DIR = $(datadir)/$(package)
-RC_DIR = ~/.$(package)
+CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin
+AUXBIN_DIR = $(libexecdir)/$(PACKAGE)
+HELP_DIR = @HELP_DIR@
+RC_DIR = @RC_DIR@
 ETC_DIR = $(sysconfdir)
-CONF_DIR = $(sysconfdir)/$(package)
+CONF_DIR = $(sysconfdir)/$(PACKAGE)
+BIN_DIR = $(bindir)
+MAN1_DIR = $(mandir)/man1
 
 TARGETS		= w3mman
-LIB_TARGETS	= w3mman2html.cgi
+CGIBIN_TARGETS	= w3mman2html.cgi
 MAN1_TARGETS	= w3mman.1
 MAN_TARGETS	= $(MAN1_TARGETS)
 
 MKDIR		= mkdir -p
 INSTALL		= @INSTALL@
 INSTALL_SCRIPT	= @INSTALL_SCRIPT@
-INSTALL_MAN	= @INSTALL_MAN@
+INSTALL_MAN	= @INSTALL_DATA@
 
-all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
+all: $(TARGETS) $(CGIBIN_TARGETS) $(MAN_TARGETS)
 
-install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
+# do nothing
+$(TARGETS) $(CGIBIN_TARGETS) $(MAN_TARGETS):
+
+install: $(TARGETS) $(CGIBIN_TARGETS) $(MAN_TARGETS)
 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
-	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
+	-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
 	for file in $(TARGETS);     \
 	do      \
 		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(BIN_DIR);	\
 	done
-	for file in $(LIB_TARGETS);     \
+	for file in $(CGIBIN_TARGETS);     \
 	do      \
-		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR);	\
+		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR);	\
 	done
 	for file in $(MAN1_TARGETS); \
 	do	\
@@ -63,9 +71,9 @@ uninstall:
 	do      \
 		rm -f $(BIN_DIR)/$$file;	\
 	done
-	-for file in $(LIB_TARGETS);     \
+	-for file in $(CGIBIN_TARGETS);     \
 	do      \
-		rm -f $(LIB_DIR)/$$file;	\
+		rm -f $(CGIBIN_DIR)/$$file;	\
 	done
 	-for file in $(MAN1_TARGETS); \
 	do \
@@ -75,7 +83,7 @@ uninstall:
 clean:
 
 distclean:
-	-rm -f $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
+	-rm -f $(TARGETS) $(CGIBIN_TARGETS) $(MAN_TARGETS)
 
 dist: all
 	@-rm -fr $(distdir)/w3mman