Mercurial > mxe-octave

changeset 3466:cf594095a7dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* octave-wrapper.in: Use version in real program name. Eliminate extra quoting.
author John W. Eaton <jwe@octave.org>
date Tue, 28 Jan 2014 04:08:34 -0500
parents 32b09e905e9e
children 9ea85a4191a1
files binary-dist-rules.mk octave-wrapper.in
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/binary-dist-rules.mk	Tue Jan 28 03:58:51 2014 -0500
+++ b/binary-dist-rules.mk	Tue Jan 28 04:08:34 2014 -0500
@@ -120,9 +120,9 @@
     mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \
        $(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|@PROGRAM_NAME@|\"$$f\"|" > $$f-t \
+      -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|@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; \
     ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \
--- a/octave-wrapper.in	Tue Jan 28 03:58:51 2014 -0500
+++ b/octave-wrapper.in	Tue Jan 28 04:08:34 2014 -0500
@@ -27,4 +27,4 @@
 export FONTCONFIG_PATH
 export GNUPLOT_DRIVER_DIR
 
-exec "$OCTAVE_HOME/bin/@PROGRAM_NAME@.real" "$@"
+exec "$OCTAVE_HOME/bin/@PROGRAM_NAME@-@OCTAVE_VERSION@.real" "$@"