Mercurial > mxe-octave
changeset 3862:c08abc3f5bf3
correctly extract first two digits of gnuplot version number
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 24 Mar 2015 16:53:05 -0400 |
| parents | dbc4b45a0f06 |
| children | 3909c600a7db |
| files | binary-dist-rules.mk |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; \