Mercurial > mxe-octave
changeset 4807:9fa4ad9a659a
* binary-dist-rules.mk: in mingw, update all non ext script files for /mingXX path
| author | John Donoghue |
|---|---|
| date | Mon, 20 Aug 2018 15:09:46 -0400 |
| parents | ecef06348773 |
| children | adc0217b36c0 |
| files | binary-dist-rules.mk |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/binary-dist-rules.mk Mon Aug 20 15:09:42 2018 -0400 +++ b/binary-dist-rules.mk Mon Aug 20 15:09:46 2018 -0400 @@ -130,9 +130,14 @@ if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ fi - echo " updating script config tool references..." - find '$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin' -type f -name "*-config" \ - -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; + echo " updating script tool references..." + #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" {}' \; ; + # 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' + endef else define copy-windows-dist-files