# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1390900114 18000
# Node ID cf594095a7dc654ef9ae1abcc5ac86367008ad3d
# Parent  32b09e905e9e303e8f56ee6d5b2cee8568cea95a
* octave-wrapper.in: Use version in real program name.
Eliminate extra quoting.

diff -r 32b09e905e9e -r cf594095a7dc binary-dist-rules.mk
--- 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; \
diff -r 32b09e905e9e -r cf594095a7dc octave-wrapper.in
--- 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" "$@"