Mercurial > mxe-octave

changeset 3900:b68c2c052a28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate extra /usr directory level for cross build of epstool
author John W. Eaton <jwe@octave.org>
date Mon, 13 Apr 2015 10:11:38 -0400
parents 1778bfc775d2
children 5f92c505c86a
files src/epstool.mk
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/epstool.mk	Mon Apr 13 06:40:23 2015 -0400
+++ b/src/epstool.mk	Mon Apr 13 10:11:38 2015 -0400
@@ -9,18 +9,12 @@
 $(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="$($(PKG)_PREFIX_DIR)" EPSTOOL_ROOT="/usr"
-    cd '$(1)' && make prefix="$(3)$($(PKG)_PREFIX_DIR)" EPSTOOL_ROOT="/usr" install
+    cd '$(1)' && make CC="$(MXE_CC)" CLINK=$(MXE_CC) LDFLAGS="$(MXE_LDFLAGS)" CFLAGS="$(MXE_CFLAGS)" prefix="$(HOST_PREFIX)" EPSTOOL_ROOT="/"
+    cd '$(1)' && make prefix="$(3)$(HOST_PREFIX)" EPSTOOL_ROOT="/" install
 endef