Mercurial > mxe-octave

diff src/zlib.mk @ 2997:4f9b72cf7ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native builds too
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2013 17:31:59 -0400
parents c766e4afd493
children 100e618349f7
line wrap: on
line diff
--- a/src/zlib.mk	Sun May 26 13:32:22 2013 -0400
+++ b/src/zlib.mk	Tue May 28 17:31:59 2013 -0400
@@ -16,17 +16,23 @@
     head -1
 endef
 
+ifeq ($(MXE_NATIVE_BUILD),yes)
 define $(PKG)_BUILD
-    cd '$(1)' && CHOST='$(TARGET)' ./configure \
+    cd '$(1)' && ./configure \
+      --prefix='$(PREFIX)/$(TARGET)'
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
+else
+define $(PKG)_BUILD
+    cd '$(1)' && CHOST='$(TARGET)' $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --static
-
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
     if [ "$(BUILD_SHARED)" = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libz.a'; \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m755 '$(1)/libz.dll.a' '$(PREFIX)/$(TARGET)/lib/libz.dll.a'; \
-      $(INSTALL) -m755 '$(1)/libz.dll' '$(PREFIX)/$(TARGET)/bin/libz.dll'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \
     fi
 endef
+endif