===================================================================
RCS file: /home/cvs/OpenXM/src/gnuplot/Makefile,v
retrieving revision 1.12
retrieving revision 1.20
diff -u -p -r1.12 -r1.20
--- OpenXM/src/gnuplot/Makefile	2004/04/14 03:04:04	1.12
+++ OpenXM/src/gnuplot/Makefile	2015/02/21 06:20:36	1.20
@@ -1,12 +1,14 @@
-# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.11 2004/03/31 01:06:10 ohara Exp $
+# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.19 2005/01/19 16:58:27 ohara Exp $
 
 OpenXM_HOME = ../..
-MASTER_SITE = ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
-DISTNAME    = gnuplot-3.7.3
+MASTER_SITE = http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
+DISTNAME    = gnuplot-4.0.0
 DISTFILES   = ${DISTNAME}.tar.gz
 DISTDIR     = ${OpenXM_HOME}/../OpenXM_dist
 WRKSRC      = work/${DISTNAME}
-PATCHES     = configure.diff plot.c.diff
+#PATCH_FILES = gnuplot-v4.diff
+PATCH_FILES = gnuplot4_interix.diff
+INSTALL_PROGRAM = install -c -s
 
 all: build
 
@@ -25,26 +27,30 @@ extract: fetch
 
 patch: extract
 	@if [ ! -f work/.patch_done ]; then \
-		for i in ${PATCHES}; do cat $$i | (cd ${WRKSRC}; patch -p0); 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
 
 build: configure
 	@if [ ! -f work/.build_done ]; then \
-	    (cd ${WRKSRC} ; ${MAKE} ) ; \
+	    (cd ${WRKSRC}/src; ${MAKE}) ; \
 	fi
 	@touch work/.build_done
 
 install: build
 	@if [ ! -f work/.install_done ]; then \
-		(cd ${WRKSRC} ; ${MAKE} install) ; \
+		prefix=`cd ${OpenXM_HOME}; pwd`; \
+		mkdir -p $${prefix}/libexec/gnuplot/4.0; \
+		(cd ${WRKSRC}/src; \
+		 ${INSTALL_PROGRAM} gnuplot     $${prefix}/bin/gnuplot ; \
+		 ${INSTALL_PROGRAM} gnuplot_x11 $${prefix}/libexec/gnuplot/4.0) ; \
 	fi
 	@touch work/.install_done
 
@@ -52,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