[w3m-dev 03945] Re: application/xhtml+xml support

* Makefile.in (ETC_DIR): added
	(CONF_DIR): added
	(DEFS): add CONF_DIR
	(MAKE_ARGS): add CONF_DIR
* config.h.in (SYS_MAILCAP): use CONF_DIR
	(SYS_URIMETHODMAP): use CONF_DIR
* func.c (sys_current_keymap_file): added
	(interpret_keymap): added
	(initKeymap): use interpret_keymap
	(interpret_mouse_action): added
	(initMouseAction): use interpret_mouse_action
* indep.c (w3m_conf_dir): added
* indep.h (w3m_conf_dir): added
* menu.c (interpret_menu): added
	(initMenu): use interpret_menu
* proto.h (confFile): added
* rc.c (init_rc): read config file by interpret_rc
	(confFile): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-07-26 17:16:24 +00:00
parent e6c62de50c
commit c913794f0c
9 changed files with 140 additions and 64 deletions

View File

@@ -28,12 +28,15 @@ CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
AUXBIN_DIR = $(libexecdir)/$(package)
HELP_DIR = $(datadir)/$(package)
RC_DIR = ~/.$(package)
ETC_DIR = $(sysconfdir)
CONF_DIR = $(sysconfdir)/$(package)
CFLAGS = $(OPTS) @CFLAGS@ $(DEFS)
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
-DLIB_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
-DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\"
-DETC_DIR=\"$(ETC_DIR)\" -DCONF_DIR=\"$(CONF_DIR)\" \
-DRC_DIR=\"$(RC_DIR)\"
LDFLAGS = @LDFLAGS@
LIBS = -L. -lindep @LIBS@
W3M_LIBS = @W3M_LIBS@
@@ -41,7 +44,8 @@ W3M_LIBS = @W3M_LIBS@
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
LIB_DIR='$(CGIBIN_DIR)' \
HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(sysconfdir)' \
HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(ETC_DIR)' \
CONF_DIR='$(CONF_DIR)' \
RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)'
IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@