view src/of-strings-1-fixes.patch @ 4245:e622765c49c7 octave-release-4.2.0

Update stable-octave package for 4.2.0 release. * src/stable-octave.mk: Update for 4.2.0 release. * src/stable-octave-1-gnulib.patch: New file. * src/stable-octave-1-docinstall.patch: Delete. * src/stable-octave-1-fixes.patch: Delete. * src/of-io-1-fixes.patch: New file.
author John W. Eaton <jwe@octave.org>
date Sun, 13 Nov 2016 12:47:40 -0500
parents 76247f439f51
children 00e61c4a5657
line wrap: on
line source

diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
--- strings-1.2.0.orig/src/Makefile	2015-06-08 13:43:45.551556353 -0400
+++ strings-1.2.0/src/Makefile	2015-06-08 13:45:22.693478306 -0400
@@ -1,11 +1,7 @@
 OCTAVE ?= octave
 MKOCTFILE ?= mkoctfile -Wall
 
-PCRE_SWITCHES := $(shell $(OCTAVE) \
-	--no-gui --no-init-file --no-site-file --silent --no-history \
-	--eval 'disp (octave_config_info ("PCRE_LIBS"));' \
-	--eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
-	)
+PCRE_SWITCHES := $(shell pcre-config --libs)
 
 pcregexp.oct: %.oct: %.cc
 	$(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<