===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.54
retrieving revision 1.57
diff -u -p -r1.54 -r1.57
--- OpenXM/src/Makefile	2000/01/09 19:34:55	1.54
+++ OpenXM/src/Makefile	2000/01/15 22:19:06	1.57
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.53 2000/01/09 19:32:13 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.56 2000/01/09 20:19:40 maekawa Exp $
 
+OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
 BINDIR=../bin
 
@@ -60,7 +61,7 @@ install-k097: all-k097
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
-	(cd kan96xx ; make install2)
+	(cd kan96xx ; make install)
 
 install-kxx: all-kxx
 	(cd kxx ; make install2)
@@ -90,14 +91,14 @@ clean:
 	(cd tigers ; make clean)
 
 distclean: clean
+	(cd $(BINDIR) ; make distclean)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
 	(cd tigers ; make distclean)
-	rm -rf $(BINDIR)/d0 $(BINDIR)/fep.linux $(BINDIR)/k0 \
-	       $(BINDIR)/lin_phcv2p $(BINDIR)/ox $(BINDIR)/ox_sm1 \
+	rm -rf $(BINDIR)/d0 $(BINDIR)/k0 $(BINDIR)/ox $(BINDIR)/ox_sm1 \
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
@@ -109,7 +110,7 @@ configure-asir:
 	(cd asir2000; make configure)
 
 configure-bin:
-	(cd $(BINDIR) ; ./configure2)
+	(cd $(BINDIR) ; make configure)
 
 configure-gnuplot:
 	(cd gnuplot ; make configure)
@@ -128,8 +129,8 @@ configure-links:
 	(cd $(LIBDIR) ; ln -f -s ../src/kan96xx/Doc sm1)
 	ln -f -s kan96xx SSkan
 	ln -f -s $(BINDIR) bin
-	ln -f -s $OPENXM_CONTRIB/gc gc
-	ln -f -s $OPENXM_CONTRIB/gmp gmp
+	ln -f -s $(OPENXM_CONTRIB)/gc gc
+	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
 
 configure-oxmath:
 	(cd ox_math; ./configure)