# HG changeset patch # User John W. Eaton # Date 1427230385 14400 # Node ID c08abc3f5bf3011360e98d3484138976dcef65bf # Parent dbc4b45a0f06dda3199a7e14f583d7cc946ad608 correctly extract first two digits of gnuplot version number diff -r dbc4b45a0f06 -r c08abc3f5bf3 binary-dist-rules.mk --- a/binary-dist-rules.mk Tue Mar 24 12:43:39 2015 -0400 +++ b/binary-dist-rules.mk Tue Mar 24 16:53:05 2015 -0400 @@ -134,7 +134,7 @@ $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \ $(SED) < octave-wrapper.in \ -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \ - -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9]+\.[0-9]+\)/\1/')|" \ + -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')|" \ -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \ && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \ rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \