Mercurial > mxe-octave

comparison src/release-octave.mk @ 5566:31f2d5949b0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not install Octave in separate folder. * src/default-octave.mk, src/release-octave.mk, src/stable-octave.mk: Do not install Octave additionally in TOP_BUILD_DIR. It is already installed at HOST_PREFIX.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 22 Oct 2020 13:50:36 +0200
parents 60c8f985d8f5
children a1004ea5643d
comparison
equal deleted inserted replaced
5565:77c1dd074c68 5566:31f2d5949b0e
213 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \ 213 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
214 && $(CONFIGURE_POST_HOOK) 214 && $(CONFIGURE_POST_HOOK)
215 215
216 $(MAKE) -C '$(1)/.build/libgnu' 216 $(MAKE) -C '$(1)/.build/libgnu'
217 217
218 ## We want both of these install steps so that we install in the
219 ## location set by the configure --prefix option, and the other
220 ## in a directory tree that will have just Octave files.
221 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' 218 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
222 219
223 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ 220 if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
224 $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \ 221 $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-octave.dll'; \
225 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ 222 cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
232 229
233 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ 230 if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
234 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ 231 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
235 fi 232 fi
236 233
237 if [ $(MXE_SYSTEM) != msvc ]; then \
238 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
239 fi
240
241 # create a file with latest installed octave rev in it 234 # create a file with latest installed octave rev in it
235 mkdir -p '$(TOP_BUILD_DIR)/octave'
242 echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version 236 echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
243 endef 237 endef