Mercurial > mxe-octave
diff binary-dist-rules.mk @ 3963:9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
* binary-dist-rules.mk: if devel tools enabled, install cmdshell.bat,
fix paths that were in build tools prefix
* dist-files.mk: add cmdshell.bat
* installer-files/cmdshell.bat: new file
* makeinst-script.sh: if cmdshell.bat exists, include in installer, and add shortcut
| author | John Donoghue |
|---|---|
| date | Tue, 09 Jun 2015 15:12:28 -0400 |
| parents | 808ff354717a |
| children | 8803dfa40236 |
line wrap: on
line diff
--- a/binary-dist-rules.mk Mon Jun 08 13:49:11 2015 -0400 +++ b/binary-dist-rules.mk Tue Jun 09 15:12:28 2015 -0400 @@ -78,10 +78,14 @@ cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/ cp $(TOP_DIR)/installer-files/octave.vbs $(OCTAVE_DIST_DIR)/ echo " updating libtool references..." - find '$(OCTAVE_DIST_DIR)/' -type f -name "*.la" -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g' {} \; ; + find '$(OCTAVE_DIST_DIR)/' -type f -name "*.la" \ + -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; echo " updating pkg-config .pc references..." - find '$(OCTAVE_DIST_DIR)/lib/pkgconfig' -type f -name "*.pc" -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g' {} \; ; - + find '$(OCTAVE_DIST_DIR)/lib/pkgconfig' -type f -name "*.pc" \ + -exec $(SED) -i 's|$(HOST_PREFIX)|/usr|g;s|$(BUILD_TOOLS_PREFIX)|/usr|g' {} \; ; + if [ "$(ENABLE_DEVEL_TOOLS)" = "yes" ]; then \ + cp $(TOP_DIR)/installer-files/cmdshell.bat $(OCTAVE_DIST_DIR)/; \ + fi endef else define copy-windows-dist-files