===================================================================
RCS file: /home/cvs/OpenXM/src/gnuplot/Makefile,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- OpenXM/src/gnuplot/Makefile	2004/03/31 01:06:10	1.11
+++ OpenXM/src/gnuplot/Makefile	2004/12/17 00:13:08	1.14
@@ -1,11 +1,13 @@
-# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.10 2004/03/30 10:27:30 ohara Exp $
+# $OpenXM: OpenXM/src/gnuplot/Makefile,v 1.13 2004/12/15 12:09:33 ohara Exp $
 
 OpenXM_HOME = ../..
-DISTNAME    = gnuplot-3.7.3
+MASTER_SITE = ftp://ftp.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
+INSTALL_PROGRAM = install -c -s
 
 all: build
 
@@ -24,7 +26,7 @@ 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 cat $$i | (cd ${WRKSRC}; patch -p1); done;\
 	fi
 	@touch work/.patch_done
 
@@ -37,13 +39,17 @@ configure: patch
 
 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
 
@@ -51,4 +57,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