Mercurial > hg > mxe

changeset 3079:23a535663fce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable to default
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 10:47:47 -0500
parents 5da5a3cf24db (current diff) 81e4b37912bf (diff)
children 2784771bed32
files
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qhull.mk
+++ b/src/qhull.mk
@@ -20,9 +20,16 @@
     cd '$(1)/.build' && '$(1)/configure' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_DISABLE_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
 
-    rm -f $(PREFIX)/$(TARGET)/lib/libqhull.la
+    if [ $(BUILD_SHARED) = yes ]; then \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libqhull.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a' '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll' '$(PREFIX)/$(TARGET)/bin/libqhull.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libqhull.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libqhull.la'; \
+    fi
 endef