===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.12
retrieving revision 1.16
diff -u -p -r1.12 -r1.16
--- OpenXM/src/Makefile	1999/11/22 08:55:07	1.12
+++ OpenXM/src/Makefile	1999/12/04 02:20:08	1.16
@@ -1,6 +1,6 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.11 1999/11/22 04:22:53 takayama Exp $
-all : all1 all3  all4 pari asir all2 all5 all6
+## $OpenXM: OpenXM/src/Makefile,v 1.15 1999/12/03 12:56:39 takayama Exp $
+all : all1 all3  all4 all-pari all-asir all2 all5 all6
 
 all1 :
 	(cd kan96xx ; make all )
@@ -27,10 +27,10 @@ all6 :
 	(cd ox_math ; make ) ; \
 	fi 
 	   
-pari :
-	(cd pari-2.0.17.beta ; make install ; make install-lib-sta ; ranlib ../../lib/libpari.a)
-asir :
-	(cd asir99; xmkmf -a; make; make install)
+all-pari :
+	(cd pari ; make install ; make install-lib-sta ; ranlib ../../OpenXM/lib/libpari.a)
+all-asir : 
+	(cd asir2000; xmkmf -a; make; make install ; make install2)
 
 
 clean :
@@ -42,7 +42,7 @@ clean :
 	(cd gnuplot ; make clean)
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
-	(cd asir99 ; make clean )
+	(cd asir2000 ; make clean )
 #	(cd ox_math ; make clean )
 	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
 
@@ -55,7 +55,7 @@ distclean :
 	(cd gnuplot ; make distclean )
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
-	(cd asir99 ; make clean )
+	(cd asir2000 ; make clean )
 #	(cd ox_math ; make clean )
 	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
 
@@ -65,8 +65,9 @@ configure :
 	(cd ../bin ; ./configure2 )
 	(cd kxx ; make configure )
 	(cd kan96xx ; make configure )
-	(cd pari-2.0.17.beta; ./Configure --prefix=../../..)
-	(cd asir99; ./configure)
+	(cd pari ; ./Configure --prefix=../../../OpenXM)
+	(cd asir2000; ./configure)
+	(cd ox_math; ./configure)