(install-db): Use $(TAR) instead of `tar'.

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

diff --git a/Makefile.in b/Makefile.in
index 113aa12..1fe039b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ LIBDIR          = @libdir@
 OPTS           = @ac_configure_args@
 CONCORD_OPTS   = $(OPTS)
 LIBCHISE_OPTS  = $(OPTS)
-XEMACS_OPTS    = $(OPTS) @xemacs_opts@
+XEMACS_OPTS    = $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
 
 CVS_ROOT = @cvs_root@
 
@@ -53,15 +53,14 @@ install-core:       install-concord install-libchise install-db
 
 install-db:
        -cd $(prefix)/share; mkdir chise
-       (cd chise-db; tar cvf - db* ) \
-               | (cd $(prefix)/share/chise; tar xvf -)
+       (cd chise-db; $(TAR) cvf - db* ) \
+               | (cd $(prefix)/share/chise; $(TAR) xvf -)
 
 
 config-xemacs: xemacs-chise xemacs-chise/src/config.h
 
 xemacs-chise/src/config.h:
-       cd xemacs-chise && ./configure --with-chise --without-xim --pdump \
-               $(XEMACS_OPTS) --with-database=berkdb
+       cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:  config-xemacs
        cd xemacs-chise && make
@@ -89,24 +88,32 @@ chise-db:
        -cd chise-db && mkdir db-$(VERSION)
        (cd `xemacs -batch -vanilla -eval \
        '(princ (file-name-as-directory data-directory))'`chise-db; \
-               tar cvf - * ) \
-               | (cd chise-db/db-$(VERSION); tar xvf - )
+               $(TAR) cvf - * ) \
+               | (cd chise-db/db-$(VERSION); $(TAR) xvf - )
        -cd chise-db && ln -s db-$(VERSION) db
 
-tar-core:
+tar-core:      cvs-base-clean
        cvs commit
        sh -c 'cvs tag -R chise-core-`echo $(VERSION) | tr . _`; \
        cd /tmp; \
        cvs -d $(CVS_ROOT) export -d chise-core-$(VERSION) \
                -r chise-core-`echo $(VERSION) | tr . _` \
                chise-base'
+       cd chise-base
+       cvs -d $(CVS_ROOT) export -d chise-core-$(VERSION) \
+               -r chise-core-`echo $(VERSION) | tr . _` \
+               concord'
+       cvs -d $(CVS_ROOT) export -d chise-core-$(VERSION) \
+               -r chise-core-`echo $(VERSION) | tr . _` \
+               libchise'
        #cd /tmp; mkdir chise-core-$(VERSION)
        #rsync -av Makefile libchise chise-db \
        #        xemacs-chise ids 
        #       /tmp/chise-core-$(VERSION)
-       rsync -av Makefile concord libchise chise-db \
-               /tmp/chise-core-$(VERSION)
-       cd /tmp; tar cvzf chise-core-$(VERSION).tar.gz \
+       #rsync -av Makefile concord libchise chise-db \
+       #       /tmp/chise-core-$(VERSION)
+       rsync -av chise-db /tmp/chise-core-$(VERSION)
+       cd /tmp; $(TAR) cvzf chise-core-$(VERSION).tar.gz \
                chise-core-$(VERSION)
 
 get-base:      concord libchise xemacs-chise tomoyo-tools ids
@@ -137,8 +144,14 @@ distclean:
        cd xemacs-chise; make distclean
        cd ids; make clean
 
+
 db-clean:
        rm -rf chise-db
 
-cvs-clean:     db-clean
-       rm -rf concord libchise xemacs-chise tomoyo-tools ids
+cvs-clean:     cvs-base-clean cvs-core-clean db-clean
+
+cvs-core-clean:
+       rm -rf concord libchise
+
+cvs-base-clean:
+       rm -rf xemacs-chise tomoyo-tools ids