diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2013-03-23 22:21:58 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-03-24 10:09:19 +0100 |
| commit | 6fc4efece8eda01b8789a4f871a0e5efbd9bcc7f (patch) | |
| tree | 2f319de870736c8cf4cd519c4c1ebb57851d2fcd /rules/gnuplot.make | |
| parent | c3b5104d59b1489792f27d4763b3ab4879928243 (diff) | |
| download | ptxdist-6fc4efece8eda01b8789a4f871a0e5efbd9bcc7f.tar.gz ptxdist-6fc4efece8eda01b8789a4f871a0e5efbd9bcc7f.tar.xz | |
gnuplot: bump to 4.6.2
And also fix a build error with new texinfo (makeinfo) installed on the
host by disabling building the info page which is not needed.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/gnuplot.make')
| -rw-r--r-- | rules/gnuplot.make | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 0142e7c39..264472957 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -16,8 +16,9 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names # -GNUPLOT_VERSION := 4.4.3 -GNUPLOT_MD5 := 639603752996f4923bc02c895fa03b45 +GNUPLOT_VERSION := 4.6.2 +GNUPLOT_MAJ_VER := $(shell echo $(GNUPLOT_VERSION) | cut -d . -f 1-2) +GNUPLOT_MD5 := 060e0a77cabb6d6055c5917b0f0b5769 GNUPLOT := gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)) @@ -58,6 +59,7 @@ GNUPLOT_AUTOCONF = \ --disable-h3d-gridbox \ --disable-wxwidgets \ --without-kpsexpand \ + --without-latex \ --without-lasergnu \ --without-linux-vga \ --without-ggi \ @@ -74,7 +76,10 @@ GNUPLOT_AUTOCONF = \ --$(call ptx/wwo, PTXCONF_GNUPLOT_PLOT)-plot \ --$(call ptx/wwo, PTXCONF_GNUPLOT_PNG)-png \ --$(call ptx/wwo, PTXCONF_GNUPLOT_GD)-gd \ - --$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf + --without-plot \ + --$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf \ + --without-tutorial \ + --without-cairo # ---------------------------------------------------------------------------- # Compile @@ -101,19 +106,23 @@ $(STATEDIR)/gnuplot.targetinstall: @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) ifdef PTXCONF_GNUPLOT_HELP - @$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.4/gnuplot.gih) + @$(call install_copy, gnuplot, 0, 0, 0644, -, \ + /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/gnuplot.gih) endif ifdef PTXCONF_GNUPLOT_POSTSCRIPT - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/PostScript) + @$(call install_tree, gnuplot, 0, 0, -, \ + /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/PostScript) endif ifdef PTXCONF_GNUPLOT_JS - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/js) + @$(call install_tree, gnuplot, 0, 0, -, \ + /usr/share/gnuplot/$(GNUPLOT_MAJ_VER)/js) endif ifdef PTXCONF_GNUPLOT_X - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) + @$(call install_copy, gnuplot, 0, 0, 0755, -, \ + /usr/libexec/gnuplot/$(GNUPLOT_MAJ_VER)/gnuplot_x11) endif @$(call install_finish, gnuplot) |