# HG changeset patch # User John Donoghue # Date 1545137869 18000 # Node ID bcfecd611e1b325d1e0dda90c76ee2328d8b5328 # Parent aa24b03ebb899a89595e0916467097120b39d052 * binary-dist-rules.mk: remove '/' from any addpath paths diff -r aa24b03ebb89 -r bcfecd611e1b binary-dist-rules.mk --- a/binary-dist-rules.mk Mon Dec 10 21:32:21 2018 +0100 +++ b/binary-dist-rules.mk Tue Dec 18 07:57:49 2018 -0500 @@ -21,7 +21,7 @@ OCTAVE_NSI_FILE := $(TOP_BUILD_DIR)/dist/octave.nsi -OCTAVE_ADD_PATH := +OCTAVE_ADD_PATH := / ifeq ($(MXE_WINDOWS_BUILD),yes) TAR_H_OPTION := -h WINDOWS_BINARY_DIST_DEPS := \ @@ -134,7 +134,7 @@ #find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \ # -exec $(SED) -i 's|$(HOST_PREFIX)|/$(OCTAVE_ADD_PATH)|g;s|$(BUILD_TOOLS_PREFIX)|/$(OCTAVE_ADD_PATH)|g' {} \; ; find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f ! -name "*.*" \ - -exec sh -c 'test `head -c2 {}` = "#!" && $(SED) -i "s|$(HOST_PREFIX)|/$(OCTAVE_ADD_PATH)|g;s|$(BUILD_TOOLS_PREFIX)|/$(OCTAVE_ADD_PATH)|g" {}' \; ; + -exec sh -c 'test `head -c2 {}` = "#!" && $(SED) -i "s|$(HOST_PREFIX)|$(OCTAVE_ADD_PATH)|g;s|$(BUILD_TOOLS_PREFIX)|$(OCTAVE_ADD_PATH)|g" {}' \; ; # some additional script files to fix $(SED) -i "s|datadir = '/usr/share'|datadir = '$(OCTAVE_ADD_PATH)/share'|g" '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/makeinfo'