===================================================================
RCS file: /home/cvs/OpenXM/src/pari/Makefile,v
retrieving revision 1.13
retrieving revision 1.17
diff -u -p -r1.13 -r1.17
--- OpenXM/src/pari/Makefile	2001/12/27 07:10:38	1.13
+++ OpenXM/src/pari/Makefile	2003/09/02 14:26:06	1.17
@@ -1,24 +1,35 @@
-# $OpenXM: OpenXM/src/pari/Makefile,v 1.12 2001/10/03 01:47:29 noro Exp $
+# $OpenXM: OpenXM/src/pari/Makefile,v 1.16 2003/03/07 10:16:58 noro Exp $
 
-PARI = ../../../OpenXM_contrib/pari-2.2
+#PARI = ../../../OpenXM_contrib/pari-2.2
+PARI = ../../../OpenXM_contrib/pari
 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 [ ! -f ./.install-lib-bin_done ]; then \
+	(cd $(PARI)/O*-* ; make install-include) ; \
+	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 ; \
+	touch ./.install-lib-bin_done ; \
+	fi
 
+
 install-doc: all 
 	(cd $(PARI) ; make doc)
 	@if [ ! -d $(OpenXM_ROOT)/doc/pari ]; then \
@@ -31,7 +42,7 @@ clean: patch-clean
 	@if [ -f ./.make_done ]; then \
 		(cd $(PARI) ; make clean) \
 	fi
-	@rm -f ./.make_done ./.configure_done
+	@rm -f ./.*_done
 
 distclean:
 	@cat BINARIES | xargs -t rm -rf
@@ -44,16 +55,19 @@ configure: patch
 
 patch: 
 	@if [ ! -f ./.patch_done ]; then \
-		(cd $(PARI)/config ; patch < $(CURDIR)/Makefile.SH.diff) \
+		(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 < $(CURDIR)/Makefile.SH.diff) \
+		(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
+	if [ ! -f ./.install-lib_done ]; then \
+	(cd $(PARI) ; make install-lib-sta) ; \
+	ranlib ../../lib/libpari.a ; \
+	touch ./.install-lib_done ; \
+	fi