X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=3b346bc0a31931d95e9531fda07f7342bf186820;hb=7f13abcef7ae7ee73d3e7c25cd9dbab8bb714b4e;hp=d25fabaec575e1b0f08ca70e4242a76f46eb9d30;hpb=19072396bf75c4c67583bb90d21ce49256e2990d;p=chise%2Flibchise.git

diff --git a/Makefile.in b/Makefile.in
index d25faba..3b346bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,29 +12,42 @@ 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@
+
+#localstatedir = @localstatedir@
+
+target	= @target@
+
+top_builddir = @builddir@
 
 
 INCLUDE_INSTALLDIR = ${prefix}/include
 LIB_INSTALLDIR	= ${libdir}
-DB_INSTALLDIR	= ${libdir}/chise
+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
 
+
 HEADERS	= chise.h chise-name.h
 OBJS	= chise.lo name.lo
 
+
 all:	libchise.la
 
 libchise.la:	$(OBJS)
@@ -43,13 +56,13 @@ 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) $(CHISE_CFLAGS) $(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,13 +70,9 @@ 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
+	gcc -Wall -Wmissing-prototypes -o sample sample.c -lchise
 
 
 clean: