From: tomo <tomo>
Date: Wed, 8 Oct 2003 13:04:50 +0000 (+0000)
Subject: (prefix): Use @prefix@.
X-Git-Tag: b1-r0_2_0-pre8~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a1e757cf0d819b8b5e4d700f680856862e28c6de;p=chise%2Flibchise.git

(prefix): Use @prefix@.
(exec_prefix): Use @exec_prefix@.
(libdir): Use @libdir@.
(libexecdir): New variable.
(DB_INSTALLDIR): Deleted.
(CHISE_DB_DIR): New variable.
(chise.lo): Specify CHISE_DB_DIR.
(install): Don't call install.db.
(install.db): Deleted.
---

diff --git a/Makefile.in b/Makefile.in
index d25faba..46564f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,29 +12,31 @@ RM	= /bin/rm -f
 ## subdirectories of this directory.  The default values for many of
 ## the variables below are expressed in terms of this one, so you may
 ## not need to change them.  This defaults to /usr/local.
-prefix=/usr/local
+prefix	= @prefix@
 
 ## Like `prefix', but used for architecture-specific files.
-exec_prefix=${prefix}
+exec_prefix = @exec_prefix@
 
-## Where to install and expect executable files to be run by XEmacs
-## rather than directly by users, and other architecture-dependent data
-## ${archlibdir} is a subdirectory of this.
-libdir=${exec_prefix}/lib
+libdir	= @libdir@
+
+libexecdir = @libexecdir@
 
 
 INCLUDE_INSTALLDIR = ${prefix}/include
 LIB_INSTALLDIR	= ${libdir}
-DB_INSTALLDIR	= ${libdir}/chise
 
 
 VERSION		= @PACKAGE_VERSION@
 
 ABI_VERSION     = 1:0:0
 
+CHISE_DB_DIR	= ${libexecdir}/chise/0.1/
+
+
 HEADERS	= chise.h chise-name.h
 OBJS	= chise.lo name.lo
 
+
 all:	libchise.la
 
 libchise.la:	$(OBJS)
@@ -43,13 +45,14 @@ libchise.la:	$(OBJS)
 		-rpath ${libdir} -version-info $(ABI_VERSION)
 
 chise.lo:	chise.c chise.h config.h sysdep.h
-	$(LIBTOOL) $(CC) $(CFLAGS) chise.c
+	$(LIBTOOL) $(CC) -DCHISE_DB_DIR=\"${CHISE_DB_DIR}\" \
+		$(CFLAGS) chise.c
 
 name.lo:	name.c chise-name.h
 	$(LIBTOOL) $(CC) $(CFLAGS) name.c
 
 
-install:	install.h install.libs install.db
+install:	install.h install.libs
 
 install.h:
 	install -c $(HEADERS) $(INCLUDE_INSTALLDIR)
@@ -57,10 +60,6 @@ install.h:
 install.libs:	libchise.la
 	$(LIBTOOL) install -c libchise.la $(LIB_INSTALLDIR)
 
-install.db:
-	-mkdir -p $(DB_INSTALLDIR)
-	ln -sf `xemacs -q -batch -eval '(princ (file-name-as-directory exec-directory))'`char-db $(DB_INSTALLDIR)
-
 
 sample:	sample.c libchise.la
 	gcc -o sample sample.c -lchise