===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.93
retrieving revision 1.96
diff -u -p -r1.93 -r1.96
--- OpenXM/src/Makefile	2000/03/13 06:51:04	1.93
+++ OpenXM/src/Makefile	2000/09/17 03:12:09	1.96
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.92 2000/03/10 03:15:57 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.95 2000/08/31 13:23:12 takayama Exp $
 
+OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
 OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
@@ -18,14 +19,7 @@ all-gc: 
 	@touch gc/.gc_make_done
 
 all-gmp: configure-gmp
-	if test -f /usr/lib/libgmp.a ; \
-	then \
-	  echo "Using /usr/lib/libgmp.a" ; \
-	  /bin/rm -rf gmp/libgmp.a ; \
-	  ln -s /usr/lib/libgmp.a gmp/libgmp.a ; \
-	else \
-	 (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; \
-	fi
+	(if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
 
 all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
 	(cd ox_toolkit; make)
@@ -98,10 +92,7 @@ install-gc : all-gc
 install-gmp : all-gmp
 	-@if test ! -f gmp/.gmp_installed ; \
 	then \
-		mkdir ../lib ; \
-		cp gmp/libgmp.a ../lib ; \
-		mkdir ../include ; \
-		cp gmp/gmp.h ../include ; \
+		(cd gmp; make install) ; \
 	fi 
 	@touch gmp/.gmp_installed
 
@@ -208,9 +199,9 @@ configure: configure-links configure-bin configure-asi
 configure-gmp: configure-links
 	@if test -f gmp/.gmp_configured ; \
 	then \
-	  echo "MESSAGE(kan96xx/Makefile): gmp is already configured. (.gmp_configured) " ;  \
+	  echo "MESSAGE: gmp is already configured. (.gmp_configured) " ;  \
 	else \
-	  (cd gmp ; ./configure ; touch .gmp_configured) ; \
+	  (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \
 	fi 
 
 configure-asir:
@@ -243,6 +234,7 @@ configure-links:
 	ln -f -s $(BINDIR) bin
 	ln -f -s $(OPENXM_CONTRIB)/gc gc
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
+	-mkdir ${OpenXM_HOME}/libexec 
 
 configure-oxtoolkit:
 	(cd ox_toolkit; ./make-configure)
@@ -257,7 +249,8 @@ generate-source-distribution : generate-source-distrib
                                generate-source-distribution-ox_toolkit
 
 generate-source-distribution-kxx :
-	(cd kxx ; rm -f .configure_done Makefile ; autoconf)
+	(cd kxx ; rm -f .configure_done Makefile )
+
 generate-source-distribution-ox_toolkit :
 	(cd ox_toolkit ; rm -f Makefile ; autoconf)