Mercurial > mxe-octave

diff src/zlib.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 b6c7244a2f66
line wrap: on
line diff
--- a/src/zlib.mk	Sat Jun 01 20:52:09 2013 -0400
+++ b/src/zlib.mk	Sun Jun 02 10:31:04 2013 -0400
@@ -19,7 +19,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-      --prefix='$(PREFIX)/$(TARGET)'
+      --prefix='$(HOST_PREFIX)'
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
@@ -27,7 +27,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && CHOST='$(TARGET)' $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         ./configure \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        --prefix='$(HOST_PREFIX)' \
         --static
     $(MAKE) -C '$(1)' -j '$(JOBS)' install