===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM/src/Makefile	1999/11/02 09:16:31	1.5
+++ OpenXM/src/Makefile	1999/11/07 06:45:24	1.9
@@ -1,11 +1,12 @@
 ## Type in make configure and make all to build all
+## $OpenXM: OpenXM/src/Makefile,v 1.8 1999/11/02 16:29:46 tam Exp $
 all : all1 all2 all3
 
 all1 :
 	(cd kan96xx ; make all )
-	(cd kan96xx ; make install-openXM-bin)
+	(cd kan96xx ; make install2)
 	(cd kxx ; make all)
-	(cd kxx ; make install)
+	(cd kxx ; make install2)
 all2 :
 	(cd gnuplot-diff ; make all)
 	(cd Ti ; make all )
@@ -13,7 +14,7 @@ all2 :
 all3 :
 	(cd k097 ; make all ; cp k0 ../../bin)
 all4 :
-	(cd JavaSupport ; make )
+	(cd OpenMath ; make )
 	   
 
 clean :
@@ -32,20 +33,17 @@ clean :
 	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6
 
 configure :
-	ln -fs ../bin bin
-	ln -fs ./kan96xx SSkan
-	ln -fs ./kan96xx/gmp gmp
-	ln -fs ./kan96xx/gc gc
-	(cd ../lib ; ln -fs ../src/k097 k097 ; ln -fs ../src/kan96xx/Doc sm1)
+	/bin/rm -f bin SSkan gmp gc ../lib/k097 ../lib/sm1
+	ln -f -s ../bin bin
+	ln -f -s ./kan96xx SSkan
+	ln -f -s ./kan96xx/gmp gmp
+	ln -f -s ./kan96xx/gc gc
+	(cd ../lib ; ln -f -s ../src/k097 k097 ; ln -f -s ../src/kan96xx/Doc sm1)
 	(cd ../bin ; ./configure2 )
 	(cd kan96xx ; make configure )
-	(cd kxx ; ln -fs  ../SSkan/plugin/ox_kan.h ox_kan.h)
+	(cd kxx ; /bin/rm -f ox_kan.h )
+	(cd kxx ; ln -f -s  ../SSkan/plugin/ox_kan.h ox_kan.h)
 	(cd ../lib/asir ; ./configure2 )
 
-install-usr-local : 
-	ln -sf `pwd`/SSkan/Doc    /usr/local/lib/sm1
-	ln -sf `pwd`/../lib/asir  /usr/local/lib/asir
-	ln -sf `pwd`/../bin/sm1  /usr/local/bin/sm1
-	ln -sf `pwd`/../bin/fep  /usr/local/bin/fep