From: tomo <tomo>
Date: Wed, 15 Oct 2003 08:40:35 +0000 (+0000)
Subject: (target): New variable.
X-Git-Tag: b1-r0_2_0-pre10~13
X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Flibchise.git;a=commitdiff_plain;h=7f13abcef7ae7ee73d3e7c25cd9dbab8bb714b4e

(target): New variable.
(top_builddir): New variable.
(CHISE_DIR_PREFIX): New variable.
(CHISE_DIR_VERSION): New variable.
(CHISE_DIR): New variable.
(CHISE_DB_DIR): Renamed from `DB_DIR'; use `CHISE_DIR'.
(CHISE_SI_DB_DIR): New variable.
(CHISE_CFLAGS): New variable; define `CHISE_SI_DB_DIR'.
(chise.lo): Use $(CHISE_CFLAGS).
---

diff --git a/Makefile.in b/Makefile.in
index b36371d..3b346bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,11 +21,24 @@ libdir	= @libdir@
 
 libexecdir = @libexecdir@
 
+#localstatedir = @localstatedir@
+
+target	= @target@
+
+top_builddir = @builddir@
+
 
 INCLUDE_INSTALLDIR = ${prefix}/include
 LIB_INSTALLDIR	= ${libdir}
-DB_DIR		= ${libexecdir}/chise/0.2/
+CHISE_DIR_PREFIX = ${libexecdir}/chise
+CHISE_DIR_VERSION = 0.2
+CHISE_DIR	= ${CHISE_DIR_PREFIX}/${CHISE_DIR_VERSION}
+CHISE_DB_DIR	= ${CHISE_DIR}/${target}
+CHISE_SI_DB_DIR	= ${CHISE_DB_DIR}/db
 
+CHISE_CFLAGS	= \
+	-DCHISE_DB_DIR=\"${CHISE_DB_DIR}/\" \
+	-DCHISE_SI_DB_DIR=\"${CHISE_SI_DB_DIR}/\"
 
 VERSION		= @PACKAGE_VERSION@
 ABI_VERSION     = 1:0:0
@@ -43,7 +56,7 @@ libchise.la:	$(OBJS)
 		-rpath ${libdir} -version-info $(ABI_VERSION)
 
 chise.lo:	chise.c chise.h config.h sysdep.h
-	$(LIBTOOL) $(CC) -DCHISE_DB_DIR=\"${DB_DIR}\" $(CFLAGS) chise.c
+	$(LIBTOOL) $(CC) $(CHISE_CFLAGS) $(CFLAGS) chise.c
 
 name.lo:	name.c chise-name.h
 	$(LIBTOOL) $(CC) $(CFLAGS) name.c