From: tomo <tomo>
Date: Fri, 11 Dec 2009 17:49:22 +0000 (+0000)
Subject: (FONTS_OPTS): New variable.
X-Git-Tag: chise-base-0_25~10
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9215d147e02861443f795f02211cfe32682619e0;p=chise%2Fchise-base.git

(FONTS_OPTS): New variable.
(config-fonts): New target.
(chise-fonts-installer/config.h): New target.
(build-fonts): New target.
(install-fonts): New target.
(install-base): Call `install-fonts'.
(chise-fonts-installer): New target.
---

diff --git a/Makefile.in b/Makefile.in
index 053a419..6196be0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,6 +11,7 @@ OPTS		= @ac_configure_args@
 CONCORD_OPTS	= $(OPTS)
 LIBCHISE_OPTS	= $(OPTS)
 XEMACS_OPTS	= @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+FONTS_OPTS	= $(OPTS)
 
 CVS_ROOT = @cvs_root@
 LEMI_CVS_ROOT = @lemi_cvs_root@
@@ -85,7 +86,19 @@ install-ids:	install-tomoyo-tools ids
 	cd ids && $(SUDO) make install
 
 
-install-base:	install-ids
+config-fonts:	chise-fonts-installer chise-fonts-installer/config.h
+
+chise-fonts-installer/config.h:
+	cd chise-fonts-installer && ./configure $(FONTS_OPTS)
+
+build-fonts:	config-fonts
+	cd chise-fonts-installer && make
+
+install-fonts:	build-fonts
+	cd chise-fonts-installer && $(SUDO) make install
+
+
+install-base:	install-ids install-fonts
 
 
 generate-db:	install-base
@@ -166,6 +179,10 @@ ids:
 	make .cvs-login
 	cvs -z9 -d $(CVS_ROOT) co ids
 
+chise-fonts-installer:
+	make .cvs-login
+	cvs -z9 -d $(CVS_ROOT) co chise-fonts-installer
+
 .cvs-login:
 	if test "`echo $(CVS_ROOT)|grep '^:pserver:'`" != ""; then \
 		cvs -d $(CVS_ROOT) login;\