diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-10-05 16:14:02 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-10-05 16:14:02 +0000 |
commit | 6250f5bdc57c17a5b292a5477c0bac3698e022fc (patch) | |
tree | 60c9707feab4dd442cb4454766bec9c8c4ad0a0e /scripts/Makefile.in | |
parent | * acinclude.m4 (AC_W3M_SSL): use PKG_CHECK_MODULES (diff) | |
download | w3m-6250f5bdc57c17a5b292a5477c0bac3698e022fc.tar.gz w3m-6250f5bdc57c17a5b292a5477c0bac3698e022fc.zip |
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
Diffstat (limited to 'scripts/Makefile.in')
-rw-r--r-- | scripts/Makefile.in | 39 |
1 files changed, 29 insertions, 10 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 |