more autoconfiscate

7 files changed, 150 insertions, 99 deletions

diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index 443fc0c..67b6dc8 100644
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -6,3 +6,4 @@ w3mhelp-funcdesc.ja.pl
 w3mhelp-funcname.pl
 w3mhelp-funcdesc-stamp
 xface2xpm
+Makefile
diff --git a/scripts/Makefile b/scripts/Makefile.in
index 9770423..2a3ea54 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile.in
@@ -1,37 +1,47 @@
+@SET_MAKE@
+SHELL=@SHELL@
+srcidr=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH= $(srcdir):.
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datadir = @datadir@
+libdir = @libdir@
+includedir = @includedir@
+infodir = @infodir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+top_srcdir = @top_srcdir@
+VPATH = $(top_srcdir):.
+DESTDIR = 
 
-prefix		= /usr/local
-DESTDIR		=
-BIN_DIR		= $(prefix)/bin
-AUXBIN_DIR	= $(prefix)/lib/w3m
-LIB_DIR		= $(prefix)/lib/w3m/cgi-bin
-HELP_DIR	= $(prefix)/share/w3m
-RC_DIR		= ~/.w3m
+CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
+AUXBIN_DIR = $(libexecdir)/$(package)
+HELP_DIR = $(datadir)/$(package)
+RC_DIR = ~/.$(package)
+ETC_DIR = $(sysconfdir)
+CONF_DIR = $(sysconfdir)/$(package)
 
 AUXBIN_TARGETS	= xface2xpm
 LIB_TARGETS	= dirlist.cgi w3mhelp.cgi w3mmail.cgi
 HELP_TARGETS	= w3mhelp-funcname.pl w3mhelp-funcdesc-stamp
 
 MKDIR		= mkdir -p
-INSTALL		= install -c
-INSTALL_SCRIPT	= $(INSTALL) -m 755
-INSTALL_DATA	= $(INSTALL) -m 644
+INSTALL		= @INSTALL@
+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+INSTALL_DATA	= @INSTALL_DATA@
 
-PERL		= /usr/local/bin/perl
-
-DOCDIRS = doc:en_English doc-jp:ja_Japanese
-
-.SUFFIXES: .in
+PERL		= @PERL@
 
 all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS)
 
-.in:
-	@echo "generating $@..."
-	@sed -e 's%@PERL@%$(PERL)%' -e 's%@HELP_DIR@%$(HELP_DIR)%' \
-	  -e 's%@DOCDIRS@%$(DOCDIRS)%' \
-	  -e 's%@RC_DIR@%$(RC_DIR)%' $< > $@
-	@chmod +x $@
-	@echo done
-
 w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab ../doc/keymap.default ../doc/keymap.lynx
 	@echo "generating w3mhelp-funcname.pl..."
 	@echo '%funcname = (' > w3mhelp-funcname.pl
@@ -89,4 +99,15 @@ uninstall:
 	done
 
 clean:
-	-rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) w3mhelp-*.pl
+	-rm -f $(HELP_TARGETS) w3mhelp-*.pl
+	-for dir in multipart w3mman; \
+	do \
+	  cd $$dir && $(MAKE) clean; \
+	done
+
+distclean:
+	-rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) 
+	-for dir in multipart w3mman; \
+	do \
+	  cd $$dir && $(MAKE) distclean; \
+	done
\ No newline at end of file
diff --git a/scripts/multipart/.cvsignore b/scripts/multipart/.cvsignore
index 854855c..db1dff2 100644
--- a/scripts/multipart/.cvsignore
+++ b/scripts/multipart/.cvsignore
@@ -1 +1,2 @@
 multipart.cgi
+Makefile
diff --git a/scripts/multipart/Makefile b/scripts/multipart/Makefile
deleted file mode 100644
index d01b9a8..0000000
--- a/scripts/multipart/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-
-prefix		= /usr/local
-BIN_DIR		= $(prefix)/bin
-LIB_DIR		= $(prefix)/lib/w3m/cgi-bin
-DESTDIR		=
-distdir		= ./distfiles
-
-LIB_TARGETS	= multipart.cgi
-
-MKDIR		= mkdir -p
-INSTALL		= install -c
-INSTALL_SCRIPT	= $(INSTALL) -m 755
-
-PERL		= /usr/local/bin/perl
-NKF		= nkf
-
-.SUFFIXES: .in
-
-all: $(LIB_TARGETS)
-
-.in:
-	sed -e 's%@PERL@%$(PERL)%g'	\
-	    -e 's%@NKF@%$(NKF)%g'	\
-	$< > $@
-	chmod +x $@
-
-install: $(LIB_TARGETS)
-	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-	for file in $(LIB_TARGETS);	\
-	do	\
-		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR);	\
-	done
-
-uninstall:
-	-for file in $(LIB_TARGETS);	\
-	do	\
-		rm -f $(LIB_DIR)/$$file;	\
-	done
-
-clean:
-	-rm -f $(LIB_TARGETS)
-
-dist: all
-	@-rm -fr $(distdir)/multipart
-	$(MKDIR) $(distdir)/multipart
-	cp Makefile README multipart.cgi.in $(distdir)/multipart
-	( cd $(distdir); tar -cf - multipart | GZIP='' gzip ) \
-		> $(distdir)/multipart.tar.gz
-	-rm -fr $(distdir)/multipart
-
diff --git a/scripts/multipart/Makefile.in b/scripts/multipart/Makefile.in
new file mode 100644
index 0000000..e153264
--- /dev/null
+++ b/scripts/multipart/Makefile.in
@@ -0,0 +1,68 @@
+@SET_MAKE@
+SHELL=@SHELL@
+srcidr=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH= $(srcdir):.
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datadir = @datadir@
+libdir = @libdir@
+includedir = @includedir@
+infodir = @infodir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+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)
+ETC_DIR = $(sysconfdir)
+CONF_DIR = $(sysconfdir)/$(package)
+
+LIB_TARGETS	= multipart.cgi
+
+MKDIR		= mkdir -p
+INSTALL		= @INSTALL@
+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+
+PERL		= @PERL@
+NKF		= @NKF@
+
+all: $(LIB_TARGETS)
+
+install: $(LIB_TARGETS)
+	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
+	for file in $(LIB_TARGETS);	\
+	do	\
+		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR);	\
+	done
+
+uninstall:
+	-for file in $(LIB_TARGETS);	\
+	do	\
+		rm -f $(LIB_DIR)/$$file;	\
+	done
+
+clean:
+
+distclean:
+	-rm -f $(LIB_TARGETS)
+
+dist: all
+	@-rm -fr $(distdir)/multipart
+	$(MKDIR) $(distdir)/multipart
+	cp Makefile README multipart.cgi.in $(distdir)/multipart
+	( cd $(distdir); tar -cf - multipart | GZIP='' gzip ) \
+		> $(distdir)/multipart.tar.gz
+	-rm -fr $(distdir)/multipart
+
diff --git a/scripts/w3mman/.cvsignore b/scripts/w3mman/.cvsignore
index 090cd50..e867c6e 100644
--- a/scripts/w3mman/.cvsignore
+++ b/scripts/w3mman/.cvsignore
@@ -2,3 +2,4 @@ w3mman
 w3mman2html.cgi
 w3mman.1
 
+Makefile
diff --git a/scripts/w3mman/Makefile b/scripts/w3mman/Makefile.in
index 6bf7b4c..c2c57e7 100644
--- a/scripts/w3mman/Makefile
+++ b/scripts/w3mman/Makefile.in
@@ -1,11 +1,33 @@
+@SET_MAKE@
+SHELL=@SHELL@
+srcidr=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH= $(srcdir):.
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datadir = @datadir@
+libdir = @libdir@
+includedir = @includedir@
+infodir = @infodir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+top_srcdir = @top_srcdir@
+VPATH = $(top_srcdir):.
+DESTDIR = 
 
-prefix		= /usr/local
-BIN_DIR		= $(prefix)/bin
-LIB_DIR		= $(prefix)/lib/w3m/cgi-bin
-MAN_DIR		= $(prefix)/man
-MAN1_DIR	= $(MAN_DIR)/man1
-DESTDIR		=
-distdir		= ./distfiles
+CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
+AUXBIN_DIR = $(libexecdir)/$(package)
+HELP_DIR = $(datadir)/$(package)
+RC_DIR = ~/.$(package)
+ETC_DIR = $(sysconfdir)
+CONF_DIR = $(sysconfdir)/$(package)
 
 TARGETS		= w3mman
 LIB_TARGETS	= w3mman2html.cgi
@@ -13,27 +35,12 @@ MAN1_TARGETS	= w3mman.1
 MAN_TARGETS	= $(MAN1_TARGETS)
 
 MKDIR		= mkdir -p
-INSTALL		= install -c
-INSTALL_SCRIPT	= $(INSTALL) -m 755
-INSTALL_MAN	= $(INSTALL) -m 644
-
-PERL		= /usr/local/bin/perl
-W3M		= w3m
-# W3M		= w3m -X -o confirm_qq=0
-MAN		= man
-
-.SUFFIXES: .in
+INSTALL		= @INSTALL@
+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+INSTALL_MAN	= @INSTALL_MAN@
 
 all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
 
-.in:
-	sed -e 's%@PERL@%$(PERL)%g'	\
-	    -e 's%@W3M@%$(W3M)%g'	\
-	    -e 's%@MAN@%$(MAN)%g'	\
-	    -e 's%@LIB_DIR@%$(LIB_DIR)%g' \
-	$< > $@
-	chmod +x $@
-
 install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
@@ -66,6 +73,8 @@ uninstall:
 	done
 
 clean:
+
+distclean:
 	-rm -f $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
 
 dist: all