===================================================================
RCS file: /home/cvs/OpenXM/src/gnuplot-diff/Attic/Makefile,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM/src/gnuplot-diff/Attic/Makefile	1999/11/17 07:46:07	1.5
+++ OpenXM/src/gnuplot-diff/Attic/Makefile	1999/11/27 20:30:03	1.9
@@ -1,20 +1,35 @@
-# $OpenXM: OpenXM/src/gnuplot-diff/Makefile,v 1.4 1999/11/16 17:45:30 maekawa Exp $
+# $OpenXM: OpenXM/src/gnuplot-diff/Makefile,v 1.8 1999/11/22 08:38:25 maekawa Exp $
 
-GNUPLOT = ../gnuplot
+GNUPLOT = ../../../OpenXM_contrib/gnuplot
+PATCHDIR = ../../OpenXM/src/gnuplot-diff
+CURDIR = ../gnuplot-diff
 BINDIR = ../../bin
 
 all : patch
-	(cd $(GNUPLOT) ; ./configure --with-x ; make )
-	/bin/rm -f $(BINDIR)/gnuplot4ox
-	mv $(GNUPLOT)/gnuplot $(BINDIR)/gnuplot4ox
-	mv $(GNUPLOT)/gnuplot_x11 $(BINDIR)/gnuplot_x11
+	@if [ ! -f $(CURDIR)/.make_done ]; then \
+		(cd $(GNUPLOT) ; ./configure --with-x ; make) \
+	fi
+	@touch $(CURDIR)/.make_done
 
+install: all
+	install -c -s $(GNUPLOT)/gnuplot $(BINDIR)/gnuplot4ox
+	install -c -s $(GNUPLOT)/gnuplot_x11 $(BINDIR)/gnuplot_x11
+
 clean : patch-clean
-	(cd $(GNUPLOT) ; make distclean )
-	/bin/rm -f $(BINDIR)/gnuplot4ox $(BINDIR)/gnuplot_x11
+	@if [ -f $(CURDIR).make_done ]; then \
+		(cd $(GNUPLOT) ; make distclean) \
+	fi
+	rm -f $(BINDIR)/gnuplot4ox $(BINDIR)/gnuplot_x11
+	@rm -f $(CURDIR)/.make_done
 
 patch:
-	(cd $(GNUPLOT) ; patch < ../gnuplot-diff/plot.c.diff)
+	@if [ ! -f $(CURDIR)/.patch_done ]; then \
+		(cd $(GNUPLOT) ; patch < $(PATCHDIR)/plot.c.diff) \
+	fi
+	@touch $(CURDIR)/.patch_done
 
 patch-clean:
-	(cd $(GNUPLOT) ; mv ./plot.c.orig plot.c ; rm -f plot.c.rej)
+	@if [ -f $(CURDIR)/.patch_done ]; then \
+		(cd $(GNUPLOT) ; patch -R < $(PATCHDIR)/plot.c.diff) \
+	fi
+	@rm -f $(CURDIR)/.patch_done