===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.113
retrieving revision 1.119
diff -u -p -r1.113 -r1.119
--- OpenXM/src/Makefile	2002/09/03 01:05:28	1.113
+++ OpenXM/src/Makefile	2003/06/26 08:59:12	1.119
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.112 2002/04/05 01:43:48 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.118 2003/06/02 20:26:58 ohara Exp $
 
 OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
@@ -38,7 +38,7 @@ all-asir: configure-asir
 all-gnuplot: configure-gnuplot
 	-(cd gnuplot ; make all)
 
-all-k097: configure-k097 all-kan96xx
+all-k097: configure-k097 all-kan96xx all-kxx
 	(cd k097 ; make all)
 
 all-kan96xx: configure-kan96xx install-gc install-gmp
@@ -56,7 +56,7 @@ all-openmath:
 	fi
 
 all-oxmath: configure-oxmath install-oxtoolkit
-	-@if test -x /usr/local/bin/math ; then \
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -93,12 +93,25 @@ install: install-asir install-gnuplot install-k097 ins
 install-gc : all-gc
 	-@if test ! -f gc/.gc_installed ; \
 	then \
-		mkdir ../lib ; \
+		if test ! -d ../lib ; then mkdir ../lib ; fi ; \
 		cp gc/gc.a ../lib/libgc.a ; \
+		if test ! -d ../include/gc ; then mkdir -p ../include/gc ; fi ; \
+		cp gc/include/gc.h gc/include/gc_cpp.h ../include/gc ; \
 	fi 
 	@touch gc/.gc_installed
 
+install-asir-gc : configure-asir
+	@if test ! -f gc/.asir-gc_installed ; \
+	then \
+		if test ! -d ../lib ; then mkdir ../lib ; fi ; \
+		(cd asir2000 ; make install-libasir-gc) ; \
+		rm -f ../lib/libgc.a ; \
+		ln -s ../lib/libasir-gc.a ../lib/libgc.a ; \
+		echo "libasir-gc.a (modifed for asir) is installed as libgc.a instead of libgc.a" ; \
+		touch gc/.asir-gc_installed ; \
+	fi
 
+
 install-gmp : all-gmp
 	-@if test ! -f gmp/.gmp_installed ; \
 	then \
@@ -141,7 +154,7 @@ install-oxc: all-oxc
 	(cd oxc; make install)
 
 install-oxmath: all-oxmath configure-util
-	-@if test -x /usr/local/bin/math ; then \
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make install) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -247,7 +260,7 @@ configure-gmp: configure-links
 	  (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \
 	fi 
 
-configure-asir:
+configure-asir: configure-directory configure-util
 	@if test -d $(OPENXM_CONTRIB2) ; then \
 		(cd asir2000 ; make configure) ; \
 	else \
@@ -293,7 +306,7 @@ configure-oxtoolkit: configure-include
 configure-oxc: configure-include
 	(cd oxc; ./make-configure)
 
-configure-oxmath: configure-include
+configure-oxmath: configure-include configure-directory
 	(cd ox_math; ./make-configure)
 
 configure-pari: