===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.65
retrieving revision 1.76
diff -u -p -r1.65 -r1.76
--- OpenXM/src/Makefile	2000/01/19 06:06:30	1.65
+++ OpenXM/src/Makefile	2000/02/01 05:11:09	1.76
@@ -1,8 +1,10 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.64 2000/01/19 03:03:34 noro Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.75 2000/02/01 04:24:18 takayama Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
 BINDIR=../bin
+RCDIR=../rc
+COPYRIGHTDIR=../Copyright
 
 all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
      all-pari all-phc all-openmath all-oxmath all-tigers
@@ -13,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:
@@ -47,6 +49,11 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
+all-misc :
+	(cd ../rc ; make repl)
+	(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 \
 	 install-phc install-tigers install-asir-doc install-asir-contrib
@@ -67,9 +74,23 @@ install-kxx: all-kxx
 	(cd kxx ; make install)
 
 install-openmath: all-openmath
-	(cd OpenMath ; make install)
+	@if ../misc/which.pl -s javac ; then \
+		(cd OpenMath ; make install) ; \
+	else \
+		echo -n "Warning: javac (java compiler) is not found " ; \
+		echo "in your search path. OpenMath will not be installed." ; \
+	fi
 
+
 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)
@@ -80,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
@@ -127,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:
@@ -149,4 +170,14 @@ configure-oxmath:
 
 configure-pari:
 	(cd pari ; make configure)
+
+clean-rc :
+	(cd $(RCDIR) ; make clean )
+all-Copyright :
+	(cd $(COPYRIGHTDIR) ; make copy-copyright )
+
+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)
+