comparison binary-dist-rules.mk @ 3862:c08abc3f5bf3

correctly extract first two digits of gnuplot version number
author John W. Eaton <jwe@octave.org>
date Tue, 24 Mar 2015 16:53:05 -0400
parents 6daa158a7018
children ac3abcea55e8
comparison
equal deleted inserted replaced
3861:dbc4b45a0f06 3862:c08abc3f5bf3
132 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \ 132 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \
133 mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \ 133 mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \
134 $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \ 134 $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \
135 $(SED) < octave-wrapper.in \ 135 $(SED) < octave-wrapper.in \
136 -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \ 136 -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \
137 -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9]+\.[0-9]+\)/\1/')|" \ 137 -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')|" \
138 -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \ 138 -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \
139 && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \ 139 && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \
140 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \ 140 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \
141 ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \ 141 ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \
142 done 142 done