===================================================================
RCS file: /home/cvs/OpenXM/src/asir2000/Makefile,v
retrieving revision 1.17
retrieving revision 1.22
diff -u -p -r1.17 -r1.22
--- OpenXM/src/asir2000/Makefile	2003/03/04 08:29:43	1.17
+++ OpenXM/src/asir2000/Makefile	2003/03/25 06:25:58	1.22
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.16 2000/03/16 07:25:06 noro Exp $
+# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.21 2003/03/08 10:19:33 ohara Exp $
 
 ASIR = ../../../OpenXM_contrib2/asir2000
 ASIR_PARI = ../../../OpenXM_contrib2/asir2000-pari
@@ -23,15 +23,21 @@ small: configure-small
 	fi
 	@touch ./.make_small_done
 
-install: all
+install-xmkmf: all
 	(cd $(ASIR) ; make install-bin-lib ; make install-libasir ; make install-libgc ; make install-include )
 
+install: all
+	(cd $(ASIR) ; make install-openxm)
+
 install-lib-with-pari: with-pari
 	(cd $(ASIR_PARI) ; make install-libasir)
 
 install-lib-small: small
 	(cd $(ASIR_SMALL) ; make install-libasir)
 
+install-libasir-gc: configure
+	(cd $(ASIR) ; make install-libasir-gc)
+
 clean:
 	(cd $(ASIR) ; make clean)
 	-@if [ -d $(ASIR_PARI) ]; then (cd $(ASIR_PARI) ; make clean)  fi
@@ -45,24 +51,26 @@ distclean: clean
 
 configure: install-pari
 	@if [ ! -f ./.configure_done ]; then \
-		(cd $(ASIR) ; ./configure -plot -pari; \
-			xmkmf ; make Makefiles ; make depend) \
+		(cd $(ASIR) ; \
+            ./configure --enable-plot --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_done
 
 configure-with-pari: configure
 	-@if [ ! -f ./.configure_with_pari_done ]; then \
 		mkdir $(ASIR_PARI) ; \
-		(cd $(ASIR_PARI) ; lndir ../asir2000 ; ./configure -pari ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
+		(cd $(ASIR_PARI) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
+			rm -f config.status config.log ; \
+            ./configure --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_with_pari_done
 
 configure-small: configure
 	-@if [ ! -f ./.configure_small_done ]; then \
 		mkdir $(ASIR_SMALL) ; \
-		(cd $(ASIR_SMALL) ; lndir ../asir2000 ; ./configure ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
+		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
+			rm -f config.status config.log ; \
+            ./configure --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_small_done
 
@@ -75,14 +83,14 @@ configure-xmkmf: install-pari
 configure-xmkmf-with-pari: configure-xmkmf
 	-@if [ ! -f ./.configure_with_pari_done ]; then \
 		mkdir $(ASIR_PARI) ; \
-		(cd $(ASIR_PARI) ; lndir ../asir2000 ; ./configure-xmkmf -pari ) \
+		(cd $(ASIR_PARI) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure-xmkmf -pari ) \
 	fi
 	@touch ./.configure_with_pari_done
 
 configure-xmkmf-small: configure-xmkmf
 	-@if [ ! -f ./.configure_small_done ]; then \
 		mkdir $(ASIR_SMALL) ; \
-		(cd $(ASIR_SMALL) ; lndir ../asir2000 ; ./configure-xmkmf ) \
+		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure-xmkmf ) \
 	fi
 	@touch ./.configure_small_done