From d7ed8ae7d7525b4e2e6896f5980fd2069656fcc6 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Sat, 9 Nov 2002 21:55:24 +0000
Subject: [w3m-dev 03398] auxbindir * XMakefile: EXT_TARGETS -> LIB_TARGETS,
 AUXBIN_TARGETS * config.h.dist: add AUXBIN_DIR 		LIB_DIR is
 cgi-bin * configure: add -auxbindir 		add AUXBIN_DIR 	
 LIB_DIR is cgi-bin 		EXT_TARGETS -> LIB_TARGETS, AUXBIN_TARGETS *
 file.c (compression_decoder): libfile_p -> auxbin_p 	(check_command):
 libfile_p -> auxbin_p 			use w3m_auxbin_dir() instead of
 w3m_lib_dir() 	(acceptableEncoding): libfile_p -> auxbin_p 	(xface2xpm):
 use auxbinFile() instead of libFile() 	(uncompress_stream): libfile_p ->
 auxbin_p 			use auxbinFile() instead of libFile() *
 image.c (getCharSize): use w3m_auxbin_dir() instead of w3m_lib_dir() 
 (openImgdisplay): use w3m_auxbin_dir() instead of w3m_lib_dir() * indep.c
 (w3m_auxbin_dir): added * indep.h (w3m_auxbin_dir): added * proto.h
 (auxbinFile): added * rc.c (auxbinFile): added 	(libFile): #if 0, no
 longer used 	(helpFile): used only #ifndef USE_HELP_CGI * NEWS: separate
 auxbindir and libdir (local-CGI, file:///$LIB/) From: Fumitoshi UKAI 
 <ukai@debian.or.jp>

---
 rc.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'rc.c')

diff --git a/rc.c b/rc.c
index 057909c..4cc0444 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.59 2002/11/06 03:27:04 ukai Exp $ */
+/* $Id: rc.c,v 1.60 2002/11/09 21:55:24 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -1483,6 +1483,16 @@ rcFile(char *base)
     }
 }
 
+char *
+auxbinFile(char *base)
+{
+    Str file = Strnew_charp(w3m_auxbin_dir());
+    Strcat_char(file, '/');
+    Strcat_charp(file, base);
+    return expandName(file->ptr);
+}
+
+#if 0 /* not used */
 char *
 libFile(char *base)
 {
@@ -1491,6 +1501,7 @@ libFile(char *base)
     Strcat_charp(file, base);
     return expandName(file->ptr);
 }
+#endif
 
 char *
 etcFile(char *base)
@@ -1501,6 +1512,7 @@ etcFile(char *base)
     return expandName(file->ptr);
 }
 
+#ifndef USE_HELP_CGI
 char *
 helpFile(char *base)
 {
@@ -1509,3 +1521,5 @@ helpFile(char *base)
     Strcat_charp(file, base);
     return expandName(file->ptr);
 }
+#endif
+
-- 
cgit v1.2.3