Mercurial > mxe-octave

changeset 2999:c1b84cca13bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bzip2 build for mingw
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2013 19:13:25 -0400
parents 9e62095edc58
children ff35d61f226f
files src/bzip2.mk
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/bzip2.mk	Tue May 28 17:42:05 2013 -0400
+++ b/src/bzip2.mk	Tue May 28 19:13:25 2013 -0400
@@ -25,13 +25,11 @@
         CC='$(MXE_CC)' \
         AR='$(MXE_AR)' \
         RANLIB='$(MXE_RANLIB)'
-    $(INSTALL) -d '$(MXE_LIBDIR)'
-    $(INSTALL) -m644 '$(1)/libbz2.a' '$(MXE_LIBDIR)/'
     $(INSTALL) -d '$(MXE_INCDIR)'
     $(INSTALL) -m644 '$(1)/bzlib.h' '$(MXE_INCDIR)/'
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(MXE_LIBDIR)/libbz2.a' --install '$(INSTALL)' --libdir '(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \
     fi
 endef
 else