summaryrefslogtreecommitdiffstats
path: root/rules/gnuplot.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2006-03-31 07:53:07 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2006-03-31 07:53:07 +0000
commit44109066165cbce726524d3084803365762ef03a (patch)
treec3c86430af3333da377af6b5ee7b27d5f2468d4e /rules/gnuplot.make
parent6611fdd7f33ce10bc748e6a3f4696bb57a1d3d9b (diff)
downloadptxdist-44109066165cbce726524d3084803365762ef03a.tar.gz
ptxdist-44109066165cbce726524d3084803365762ef03a.tar.xz
* gnuplot.in, gnuplot.make:
fixed gnuplot with X git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5304 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gnuplot.make')
-rw-r--r--rules/gnuplot.make11
1 files changed, 5 insertions, 6 deletions
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index d915b7f0b..727434f36 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -123,12 +123,6 @@ else
GNUPLOT_AUTOCONF += --without-gd
endif
-ifdef PTXCONF_GNUPLOT_GIF
-GNUPLOT_AUTOCONF += --with-gif
-else
-GNUPLOT_AUTOCONF += --without-gif
-endif
-
ifdef PTXCONF_GNUPLOT_PDF
GNUPLOT_AUTOCONF += --with-pdf
else
@@ -164,6 +158,7 @@ gnuplot_install: $(STATEDIR)/gnuplot.install
$(STATEDIR)/gnuplot.install: $(gnuplot_install_deps_default)
@$(call targetinfo, $@)
+ @$(call install, GNUPLOT)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -186,6 +181,10 @@ $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps_default)
@$(call install_copy, gnuplot, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot)
+ifdef PTXCONF_GNUPLOT_X
+ @$(call install_copy, gnuplot, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot_x11, /usr/libexec/gnuplot/4.0/gnuplot_x11)
+endif
+
@$(call install_finish, gnuplot)
@$(call touch, $@)