diff options
| -rw-r--r-- | ChangeLog | 26 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | scripts/Makefile.in | 39 | ||||
| -rw-r--r-- | scripts/multipart/Makefile.in | 16 | ||||
| -rw-r--r-- | scripts/w3mman/Makefile.in | 38 |
7 files changed, 100 insertions, 33 deletions
@@ -1,3 +1,27 @@ +2003-10-06 Fumitoshi UKAI <ukai@debian.or.jp> + + * 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 + 2003-10-01 Akira TAGOH <at@gclab.org> * acinclude.m4 (AC_W3M_SSL): use PKG_CHECK_MODULES @@ -8112,4 +8136,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.877 2003/09/30 15:42:38 ukai Exp $ +$Id: ChangeLog,v 1.878 2003/10/05 16:14:02 ukai Exp $ diff --git a/Makefile.in b/Makefile.in index 8fc6f39..a0f89c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,7 +30,7 @@ DESTDIR = CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin AUXBIN_DIR = $(libexecdir)/$(PACKAGE) -HELP_DIR = $(datadir)/$(PACKAGE) +HELP_DIR = @HELP_DIR@ RC_DIR = @RC_DIR@ ETC_DIR = $(sysconfdir) CONF_DIR = $(sysconfdir)/$(PACKAGE) @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M W3M_LANG AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET POSUBST POLANG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY PKG_CONFIG SSL_CFLAGS SSL_LIBS USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M W3M_LANG AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET POSUBST POLANG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY PKG_CONFIG SSL_CFLAGS SSL_LIBS USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN HELP_DIR RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -9255,6 +9255,12 @@ _ACEOF fi +HELP_DIR="$(datadir)/$(PACKAGE)" +cat >>confdefs.h <<_ACEOF +#define HELP_DIR "$HELP_DIR" +_ACEOF + + RC_DIR="~/.$PACKAGE" cat >>confdefs.h <<_ACEOF #define RC_DIR "$RC_DIR" @@ -10035,6 +10041,7 @@ s,@HAVE_SYS_ERRLIST@,$HAVE_SYS_ERRLIST,;t t s,@HAVE_SIGSETJMP@,$HAVE_SIGSETJMP,;t t s,@RETSIGTYPE@,$RETSIGTYPE,;t t s,@SIGNAL_RETURN@,$SIGNAL_RETURN,;t t +s,@HELP_DIR@,$HELP_DIR,;t t s,@RC_DIR@,$RC_DIR,;t t s,@DOCDIRS@,$DOCDIRS,;t t s,@CURRENT_VERSION@,$CURRENT_VERSION,;t t diff --git a/configure.in b/configure.in index b9970fd..9e24edb 100644 --- a/configure.in +++ b/configure.in @@ -149,6 +149,9 @@ AC_W3M_SYS_ERRLIST AC_W3M_SIGSETJMP AC_W3M_SIGNAL +AC_SUBST(HELP_DIR) +HELP_DIR="$(datadir)/$(PACKAGE)" +AC_DEFINE_UNQUOTED(HELP_DIR, "$HELP_DIR") AC_SUBST(RC_DIR) RC_DIR="~/.$PACKAGE" AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR") 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 |