Mercurial > mxe-octave

changeset 3895:eb9594968ac1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
epstool: use prefix=HOST_PREFIX if cross building (Bug #44809) * src/epstool.mk: if MXE_NATIVE_BUILD=no, use HOST_PREFIX
author John Donoghue <john.donoghue@ieee.org>
date Sat, 11 Apr 2015 11:44:46 -0400
parents 3fcb38c52a01
children dbaa6ed1a64a
files src/epstool.mk
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/epstool.mk	Fri Apr 10 08:35:32 2015 -0400
+++ b/src/epstool.mk	Sat Apr 11 11:44:46 2015 -0400
@@ -9,12 +9,18 @@
 $(PKG)_URL      := http://pkgs.fedoraproject.org/repo/pkgs/epstool/epstool-3.08.tar.gz/465a57a598dbef411f4ecbfbd7d4c8d7/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
+ifeq ($(MXE_NATIVE_BUILD),yes)
+ $(PKG)_PREFIX_DIR := $(TOP_DIR)
+else
+ $(PKG)_PREFIX_DIR := $(HOST_PREFIX)
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
     echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && make CC="$(MXE_CC)" CLINK=$(MXE_CC) LDFLAGS="$(MXE_LDFLAGS)" CFLAGS="$(MXE_CFLAGS)" prefix="$(TOP_DIR)" EPSTOOL_ROOT="/usr"
-    cd '$(1)' && make prefix="$(3)$(TOP_DIR)" EPSTOOL_ROOT="/usr" install
+    cd '$(1)' && make CC="$(MXE_CC)" CLINK=$(MXE_CC) LDFLAGS="$(MXE_LDFLAGS)" CFLAGS="$(MXE_CFLAGS)" prefix="$($(PKG)_PREFIX_DIR)" EPSTOOL_ROOT="/usr"
+    cd '$(1)' && make prefix="$(3)$($(PKG)_PREFIX_DIR)" EPSTOOL_ROOT="/usr" install
 endef