===================================================================
RCS file: /home/cvs/OpenXM/src/gnuplot/Makefile,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- OpenXM/src/gnuplot/Makefile	2004/12/15 12:09:33	1.13
+++ OpenXM/src/gnuplot/Makefile	2005/01/19 16:58:27	1.19
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.12 2004/04/14 03:04:04 ohara Exp $
+# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.18 2005/01/18 16:31:17 ohara Exp $
 
 OpenXM_HOME = ../..
 MASTER_SITE = ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
@@ -6,7 +6,8 @@ DISTNAME    = gnuplot-4.0.0
 DISTFILES   = ${DISTNAME}.tar.gz
 DISTDIR     = ${OpenXM_HOME}/../OpenXM_dist
 WRKSRC      = work/${DISTNAME}
-PATCH_FILES = gnuplot-v4.diff
+#PATCH_FILES = gnuplot-v4.diff
+PATCH_FILES = gnuplot4_interix.diff
 INSTALL_PROGRAM = install -c -s
 
 all: build
@@ -26,14 +27,14 @@ extract: fetch
 
 patch: extract
 	@if [ ! -f work/.patch_done ]; then \
-		for i in ${PATCH_FILES}; do cat $$i | (cd ${WRKSRC}; patch -p1); done;\
+		for i in ${PATCH_FILES} "" ; do if [ -f "$$i" ]; then cat $$i | (cd ${WRKSRC}; patch -p1); fi done;\
 	fi
 	@touch work/.patch_done
 
 configure: patch
 	if [ ! -f work/.configure_done ]; then \
 		prefix=`cd ${OpenXM_HOME}; pwd` ; \
-		(cd ${WRKSRC} ; ./configure --with-x --prefix="$$prefix" ) ; \
+		(cd ${WRKSRC} ; ./configure --with-x --prefix="$$prefix" --without-pdf) ; \
 	fi
 	@touch work/.configure_done
 
@@ -48,7 +49,7 @@ install: build
 		prefix=`cd ${OpenXM_HOME}; pwd`; \
 		mkdir -p $${prefix}/libexec/gnuplot/4.0; \
 		(cd ${WRKSRC}/src; \
-		 ${INSTALL_PROGRAM} gnuplot     $${prefix}/bin/gnuplot4ox ; \
+		 ${INSTALL_PROGRAM} gnuplot     $${prefix}/bin/gnuplot ; \
 		 ${INSTALL_PROGRAM} gnuplot_x11 $${prefix}/libexec/gnuplot/4.0) ; \
 	fi
 	@touch work/.install_done
@@ -57,4 +58,4 @@ clean:
 	-rm -rf work
 
 distclean: clean
-	-rm -f ${OpenXM_HOME}/bin/gnuplot4ox ${OpenXM_HOME}/bin/gnuplot_x11
+	-rm -f ${OpenXM_HOME}/bin/gnuplot ${OpenXM_HOME}/bin/gnuplot_x11