===================================================================
RCS file: /home/cvs/OpenXM/src/pari/Makefile,v
retrieving revision 1.5
retrieving revision 1.14
diff -u -p -r1.5 -r1.14
--- OpenXM/src/pari/Makefile	2000/01/08 18:41:19	1.5
+++ OpenXM/src/pari/Makefile	2001/12/27 07:16:01	1.14
@@ -1,8 +1,7 @@
-# $OpenXM: OpenXM/src/pari/Makefile,v 1.4 2000/01/08 18:30:18 maekawa Exp $
+# $OpenXM: OpenXM/src/pari/Makefile,v 1.13 2001/12/27 07:10:38 noro Exp $
 
-PARI = ../../../OpenXM_contrib/pari
-CURDIR = ../../OpenXM/src/pari
-BINDIR = ../../bin
+PARI = ../../../OpenXM_contrib/pari-2.2
+OpenXM_ROOT = ../../../OpenXM
 
 all: configure
 	@if [ ! -f ./.make_done ]; then \
@@ -10,22 +9,51 @@ all: configure
 	fi
 	@touch ./.make_done
 
-install: all
-	(cd $(PARI) ; make install install-lib-sta) \
+install: install-lib-bin
 
-clean:
+install-lib-bin: all install-lib
+	(cd $(PARI)/O*-* ; make install-lib-dyn)
+	(cd $(PARI)/O*-* ; make install-include)
+	(cd $(PARI)/O*-* ; make install-bin)
+	(cd $(PARI)/O*-* ; make install-misc)
+	(cd $(PARI)/O*-* ; make install-man)
+	(cd $(PARI)/O*-* ; make install-data)
+
+install-doc: all 
+	(cd $(PARI) ; make doc)
+	@if [ ! -d $(OpenXM_ROOT)/doc/pari ]; then \
+	   mkdir $(OpenXM_ROOT)/doc/pari ;\
+	fi
+	-cp $(OpenXM_ROOT)/lib/pari/users.dvi  $(OpenXM_ROOT)/doc/pari/users.dvi
+	-cp $(OpenXM_ROOT)/lib/pari/tutorial.dvi  $(OpenXM_ROOT)/doc/pari/tutorial.dvi
+
+clean: patch-clean
 	@if [ -f ./.make_done ]; then \
 		(cd $(PARI) ; make clean) \
 	fi
 	@rm -f ./.make_done ./.configure_done
 
 distclean:
-	rm -rf ../../lib/libpari.* ../../lib/pari
-	rm -rf ../../include/pari
-	rm -rf $(BINDIR)/gp $(BINDIR)/gp-2.0
+	@cat BINARIES | xargs -t rm -rf
 
-configure:
+configure: patch
 	@if [ ! -f ./.configure_done ]; then \
 		(cd $(PARI) ; ./Configure --prefix=../../../OpenXM) \
 	fi
 	@touch ./.configure_done
+
+patch: 
+	@if [ ! -f ./.patch_done ]; then \
+		(cd $(PARI)/config ; patch < ../../../OpenXM/src/pari/Makefile.SH.diff) \
+	fi
+	@touch ./.patch_done
+
+patch-clean: 
+	@if [ -f ./.patch_done ]; then \
+		(cd $(PARI)/config ; patch -R < ../../../OpenXM/src/pari/Makefile.SH.diff) \
+	fi
+	@rm -f ./.patch_done
+
+install-lib: all
+	(cd $(PARI) ; make install-lib-sta)
+	ranlib ../../lib/libpari-2.2.a