# HG changeset patch # User John W. Eaton # Date 1392608928 18000 # Node ID 1e09264307e8eac8a710db61ad5cf68bba948e87 # Parent 897cd161410925747321d20870aad2200b25d3fe binary-dist-rules.mk: Style fixes. diff -r 897cd1614109 -r 1e09264307e8 binary-dist-rules.mk --- a/binary-dist-rules.mk Sun Feb 16 22:46:54 2014 -0500 +++ b/binary-dist-rules.mk Sun Feb 16 22:48:48 2014 -0500 @@ -52,21 +52,21 @@ endef ifeq ($(MXE_WINDOWS_BUILD),yes) -define copy-windows-dist-files - echo " msys base files..." - cd $(TOP_DIR)/msys-base \ - && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) - echo " msys extension files..." - cd $(TOP_DIR)/msys-extension \ - && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) - echo " notepad++..." - cd $(TOP_DIR) \ - && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) - echo " README.html..." - cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ - echo " refblas..." - cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll -endef + define copy-windows-dist-files + echo " msys base files..." + cd $(TOP_DIR)/msys-base \ + && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) + echo " msys extension files..." + cd $(TOP_DIR)/msys-extension \ + && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) + echo " notepad++..." + cd $(TOP_DIR) \ + && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) + echo " README.html..." + cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ + echo " refblas..." + cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll + endef endif define make-dist-files-writable @@ -105,24 +105,24 @@ OCTAVE_WRAPPER_SCRIPTS = octave octave-cli octave-config ifeq ($(MXE_SYSTEM), gnu-linux) -define install-octave-wrapper-scripts - echo "installing octave wrapper scripts..." - for f in $(OCTAVE_WRAPPER_SCRIPTS); do \ - 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 \ - && $(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; \ - done -endef + define install-octave-wrapper-scripts + echo "installing octave wrapper scripts..." + for f in $(OCTAVE_WRAPPER_SCRIPTS); do \ + 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 \ + && $(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; \ + done + endef else -define install-octave-wrapper-scripts - echo "no octave wrapper scripts to install for this system..." -endef + define install-octave-wrapper-scripts + echo "no octave wrapper scripts to install for this system..." + endef endif .PHONY: binary-dist-files