diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2005-08-01 15:23:22 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2005-08-01 15:23:22 +0000 |
| commit | 7944395a0ef1dc3046185eabcd7fcb0c794a70e5 (patch) | |
| tree | 8a898d34f33445d5ea7f6b590bb9bbe6fe586bde /rules/gnuplot.make | |
| parent | 119ccea14e055a417b0d402242a75026cbfbe3d2 (diff) | |
| download | ptxdist-7944395a0ef1dc3046185eabcd7fcb0c794a70e5.tar.gz ptxdist-7944395a0ef1dc3046185eabcd7fcb0c794a70e5.tar.xz | |
* adopted to new libpng version
* zlib version bump
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3002 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gnuplot.make')
| -rw-r--r-- | rules/gnuplot.make | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 7e0ef99f9..5e8d73574 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -75,8 +75,8 @@ endif GNUPLOT_PATH = PATH=$(CROSS_PATH) GNUPLOT_ENV = $(CROSS_ENV) -#GNUPLOT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#GNUPLOT_ENV += +GNUPLOT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig +GNUPLOT_ENV += LIBPNG_CONFIG=$(CROSS_LIB_DIR)/bin/libpng-config # # autoconf @@ -142,8 +142,6 @@ GNUPLOT_AUTOCONF += --without-lisp-files GNUPLOT_AUTOCONF += --without-row-help GNUPLOT_AUTOCONF += --without-tutorial -GNUPLOT_ENV += ac_cv_path_LIBPNG_CONFIG=$(LIBPNG125_DIR)/libpng-config - $(STATEDIR)/gnuplot.prepare: $(gnuplot_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(GNUPLOT_DIR)/config.cache) @@ -205,7 +203,7 @@ $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps) @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") @$(call install_fixup,DEPENDS,) @$(call install_fixup,DESCRIPTION,missing) - + @$(call install_copy, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot) @$(call install_finish) |