update.

[chise/chise-base.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b58f0bc..bb28c9c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,10 +10,11 @@ LIBDIR              = @libdir@
 OPTS           = @ac_configure_args@
 CONCORD_OPTS   = $(OPTS)
 LIBCHISE_OPTS  = $(OPTS)
-XEMACS_OPTS    = $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+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@
+CVS_ROOT = "@cvs_root@"
+LEMI_CVS_ROOT = "@lemi_cvs_root@"
 XEMACS_PACKAGES_URL = http://ftp.xemacs.org/pub/xemacs/packages/
 
 all:   build-concord build-libchise
@@ -66,7 +67,7 @@ xemacs-chise/src/config.h:
        cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:  config-xemacs
-       cd xemacs-chise && LANG=C make
+       cd xemacs-chise && LC_ALL=C make
 
 install-xemacs:        install-libchise $(BINDIR)/xemacs
 
@@ -76,7 +77,7 @@ $(BINDIR)/xemacs:     build-xemacs xemacs-chise/src/xemacs
 
 install-apel:  install-xemacs apel $(LIBDIR)/xemacs/xemacs-packages
        -$(SUDO) mkdir $(LIBDIR)/xemacs/site-packages
-       cd apel && LANG=C $(SUDO) make install-package
+       cd apel && LC_ALL=C $(SUDO) make install-package
 
 install-tomoyo-tools:  install-apel tomoyo-tools $(LIBDIR)/xemacs/mule-packages
        cd tomoyo-tools && $(SUDO) make install
@@ -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
@@ -139,7 +152,10 @@ tar-base:
                tomoyo-tools; \
        cvs -d $(CVS_ROOT) export \
                -r chise-base-`echo $(VERSION) | tr . _` \
-               ids'
+               ids; \
+       cvs -d $(CVS_ROOT) export \
+               -r chise-base-`echo $(VERSION) | tr . _` \
+               chise-fonts-installer'
        rsync -av chise-db /tmp/chise-base-$(VERSION)
        cd /tmp; $(TAR) cvzf chise-base-$(VERSION).tar.gz \
                chise-base-$(VERSION)
@@ -166,6 +182,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;\
@@ -185,7 +205,7 @@ apel:
 $(LIBDIR)/xemacs/xemacs-packages:
        cd $(LIBDIR)/xemacs && \
        curl $(XEMACS_PACKAGES_URL)/xemacs-sumo.tar.gz \
-       | $(SUDO) $(TAR) xvzf -
+       | $(SUDO) $(TAR) xvzf - --exclude=apel
 
 $(LIBDIR)/xemacs/mule-packages:
        cd $(LIBDIR)/xemacs && \
@@ -198,6 +218,7 @@ distclean:
        cd libchise; make distclean
        cd xemacs-chise; make distclean
        cd ids; make clean
+       cd chise-fonts-installer; make distclean
 
 
 db-clean:
@@ -209,4 +230,4 @@ cvs-core-clean:
        rm -rf concord libchise
 
 cvs-base-clean:
-       rm -rf xemacs-chise tomoyo-tools ids
+       rm -rf xemacs-chise apel tomoyo-tools ids chise-fonts-installer