===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.108
retrieving revision 1.112
diff -u -p -r1.108 -r1.112
--- OpenXM/src/Makefile	2001/08/21 00:47:17	1.108
+++ OpenXM/src/Makefile	2002/04/05 01:43:48	1.112
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.107 2001/05/31 08:04:34 ohara Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.111 2002/04/05 01:28:46 takayama Exp $
 
 OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
@@ -21,7 +21,7 @@ all-gc: 
 all-gmp: configure-gmp
 	(if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-kxx
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util
 	(cd ox_toolkit; make)
 
 all-oxc: configure-oxc install-oxtoolkit
@@ -48,7 +48,7 @@ all-kxx: configure-kxx all-kan96xx
 	(cd kxx ; make all)
 
 all-openmath:
-	@if ../misc/which.pl -s javac ; then \
+	-@if ../misc/which.pl -s javac ; then \
 		(cd OpenMath ; make all) ; \
 	else \
 		echo -n "Warning: javac (java compiler) is not found " ; \
@@ -124,7 +124,7 @@ install-kxx: all-kxx
 	(cd kxx ; make install)
 
 install-openmath: all-openmath
-	@if ../misc/which.pl -s javac ; then \
+	-@if ../misc/which.pl -s javac ; then \
 		(cd OpenMath ; make install) ; \
 	else \
 		echo -n "Warning: javac (java compiler) is not found " ; \
@@ -137,7 +137,7 @@ install-oxtoolkit: all-oxtoolkit
 install-oxc: all-oxc
 	(cd oxc; make install)
 
-install-oxmath: all-oxmath install-kxx
+install-oxmath: all-oxmath configure-util
 	-@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make install) ; \
 	else \
@@ -205,11 +205,15 @@ distclean: clean
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure: configure-links configure-include configure-bin configure-asir \
+configure: configure-links configure-include configure-bin configure-util \
+       configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   configure-pari configure-gmp
 
+configure-util: configure-directory
+	(cd util; make install)
+
 configure-include: configure-include-make-dir ../include/ox/cmotag.h ../include/ox/oxMessageTag.h ../include/ox/smCommand.h
 
 configure-include-make-dir:
@@ -255,10 +259,10 @@ configure-k097: configure-links
 configure-kan96xx: configure-links
 	(cd kan96xx ; make configure)
 
-configure-kxx: 
+configure-kxx: configure-util
 	( cd kxx ; ./make-configure) 
 
-configure-links:
+configure-links: configure-directory
 	-@if [ ! -f ./.configure-links-done ] ; then \
 	rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp ; \
 	(cd $(LIBDIR) ; ln -f -s ../src/k097 k097) ; \
@@ -269,6 +273,11 @@ configure-links:
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp ; \
 	mkdir ${OpenXM_HOME}/libexec ; \
 	touch ./.configure-links-done ;\
+	fi
+
+configure-directory:
+	-@if [ ! -d ../bin ] ; then \
+	mkdir ../bin ; \
 	fi
 
 configure-oxtoolkit: configure-include