===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.69
retrieving revision 1.76
diff -u -p -r1.69 -r1.76
--- OpenXM/src/Makefile	2000/01/20 09:17:44	1.69
+++ OpenXM/src/Makefile	2000/02/01 05:11:09	1.76
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.68 2000/01/20 07:25:26 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.75 2000/02/01 04:24:18 takayama Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
@@ -15,13 +15,13 @@ all-asir: configure-asir
 all-gnuplot: configure-gnuplot
 	(cd gnuplot ; make all)
 
-all-k097: configure-k097
+all-k097: configure-k097 all-kan96xx
 	(cd k097 ; make all)
 
 all-kan96xx: configure-kan96xx
 	(cd kan96xx ; make all)
 
-all-kxx: configure-kxx
+all-kxx: configure-kxx all-kan96xx
 	(cd kxx ; make all)
 
 all-openmath:
@@ -51,7 +51,8 @@ all-tigers:
 
 all-misc :
 	(cd ../rc ; make repl)
-	(cd ../doc ; make all)
+	(cd ../doc ; make all-install)
+	(cd ../doc ; make all-spec)
 
 install: install-asir install-gnuplot install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
@@ -82,6 +83,14 @@ install-openmath: all-openmath
 
 
 install-oxmath: all-oxmath
+	@if test -d /usr/local/mathematica ; then \
+		(cd ox_math ; make install) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be installed." ; \
+	fi
+	-(cd ox_math/documents ; make install)
+	-(cd ox_math/lib ; make install)
 
 install-pari: all-pari
 	(cd pari ; make install)
@@ -92,7 +101,7 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
-install-asir-contrib: install-asir
+install-asir-contrib: install-asir install-kxx
 	(cd asir-contrib ; make install)
 
 install-asir-doc: install-asir
@@ -139,12 +148,12 @@ configure-bin:
 configure-gnuplot:
 	(cd gnuplot ; make configure)
 
-configure-k097: install-kan96xx
+configure-k097: 
 
 configure-kan96xx:
 	(cd kan96xx ; make configure)
 
-configure-kxx: install-kan96xx
+configure-kxx: 
 	(cd kxx ; make configure)
 
 configure-links:
@@ -167,5 +176,8 @@ clean-rc :
 all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
-dist : all-Copyright clean-rc all install all-misc
+binary-dist : all-Copyright clean-rc all install all-misc 
+	(cd ../bin ; rm -f asir ; ln -s ./ox_asir asir)
+	(cd ../lib/asir ; rm -f ox_asir ox_launch ox_plot help ; ln -s ./asir ox_asir ; ln -s ./asir ox_launch ; ln -s ./asir ox_plot ; ln -s ./help-eg help)
+