===================================================================
RCS file: /home/cvs/OpenXM/src/pari/Makefile,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM/src/pari/Makefile	2000/08/31 06:28:21	1.11
+++ OpenXM/src/pari/Makefile	2001/12/27 08:31:38	1.15
@@ -1,24 +1,31 @@
-# $OpenXM: OpenXM/src/pari/Makefile,v 1.10 2000/02/27 07:26:21 takayama Exp $
+# $OpenXM: OpenXM/src/pari/Makefile,v 1.14 2001/12/27 07:16:01 noro Exp $
 
-PARI = ../../../OpenXM_contrib/pari
+PARI = ../../../OpenXM_contrib/pari-2.2
 OpenXM_ROOT = ../../../OpenXM
 
 all: configure
 	@if [ ! -f ./.make_done ]; then \
-		(cd $(PARI) ; make all) \
+		if [ "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then\
+			(cd $(PARI)/O*-* ; make lib-sta); \
+		else \
+			(cd $(PARI) ; make all);  \
+		fi \
 	fi
 	@touch ./.make_done
 
 install: install-lib-bin
 
 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)
+	if [ "`uname | sed -e 's/_.*$$//'`" != "CYGWIN" ]; then \
+		(cd $(PARI)/O*-* ; make install-lib-dyn);  \
+		(cd $(PARI)/O*-* ; make install-bin);  \
+		(cd $(PARI)/O*-* ; make install-misc);  \
+		(cd $(PARI)/O*-* ; make install-man);  \
+		(cd $(PARI)/O*-* ; make install-data);  \
+	fi
 
+
 install-doc: all 
 	(cd $(PARI) ; make doc)
 	@if [ ! -d $(OpenXM_ROOT)/doc/pari ]; then \
@@ -27,7 +34,7 @@ install-doc: all 
 	-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:
+clean: patch-clean
 	@if [ -f ./.make_done ]; then \
 		(cd $(PARI) ; make clean) \
 	fi
@@ -36,12 +43,24 @@ clean:
 distclean:
 	@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.a
+	ranlib ../../lib/libpari-2.2.a