Mercurial > mxe-octave

comparison src/octave.mk @ 3012:100e618349f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve handling of prefix directories by defining HOST_PREFIX and BUILD_TOOLS_PREFIX variables in top-level Makefile.
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 10:31:04 -0400
parents 4f9b72cf7ee7
children bcc26ffe9a0f
comparison
equal deleted inserted replaced
3011:75e142c0004b 3012:100e618349f7
12 ifeq ($(MXE_NATIVE_BUILD),yes) 12 ifeq ($(MXE_NATIVE_BUILD),yes)
13 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH="'$(LD_LIBRARY_PATH)'" 13 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH="'$(LD_LIBRARY_PATH)'"
14 else 14 else
15 ifeq ($(MXE_SYSTEM),mingw) 15 ifeq ($(MXE_SYSTEM),mingw)
16 $(PKG)_CROSS_CONFIG_OPTIONS := \ 16 $(PKG)_CROSS_CONFIG_OPTIONS := \
17 FLTK_CONFIG='$(PREFIX)/bin/$(TARGET)-fltk-config' \ 17 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' \
18 gl_cv_func_gettimeofday_clobber=no 18 gl_cv_func_gettimeofday_clobber=no
19 endif 19 endif
20 endif 20 endif
21 21
22 define $(PKG)_UPDATE 22 define $(PKG)_UPDATE
30 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ 30 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
31 $(CONFIGURE_CPPFLAGS) \ 31 $(CONFIGURE_CPPFLAGS) \
32 LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \ 32 LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \
33 --host='$(TARGET)' \ 33 --host='$(TARGET)' \
34 --build="`config.guess`" \ 34 --build="`config.guess`" \
35 --prefix='$(PREFIX)/$(TARGET)' \ 35 --prefix='$(HOST_PREFIX)' \
36 $($(PKG)_CROSS_CONFIG_OPTIONS) 36 $($(PKG)_CROSS_CONFIG_OPTIONS)
37 37
38 ## We want both of these install steps so that we install in the 38 ## We want both of these install steps so that we install in the
39 ## location set by the configure --prefix option, and the other 39 ## location set by the configure --prefix option, and the other
40 ## in a directory tree that will have just Octave files. 40 ## in a directory tree that will have just Octave files.
41 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install 41 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
42 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(PREFIX)/../octave install 42 $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install
43 endef 43 endef
44 44