diff src/blas.mk @ 3293:cf6f40cededb

Support file list generation in packages. For the following modules: - arpack - blas - build-autoconf - build-automake - build-cmake - build-gperf - build-libtool - build-msvctools - build-pkg-config - build-texinfo - bzip2 - curl - dbus - expat - fftw - fltk - fontconfig - freetype - gettext - glpk - gmp - gnuplot - gnutls - graphicsmagick - hdf5 - jasper - jpeg - lapack - lcms - libgcrypt - libgpg_error - libiconv - libidn - libpng - libssh2 - libxml2 - ncurses - nettle - openssl - pcre - pstoedit - zlib - qhull - qrupdate - qscintilla - qt - readline - suitesparse - texinfo - tiff
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 09 Nov 2013 23:28:04 -0500
parents 5ef49fb3299d
children 13be64f9f16d
line wrap: on
line diff
--- a/src/blas.mk	Sat Nov 09 23:28:03 2013 -0500
+++ b/src/blas.mk	Sat Nov 09 23:28:04 2013 -0500
@@ -24,11 +24,11 @@
     cd '$(1)' && $(MXE_AR) cr libblas.a *.o
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)'; \
     fi
 
     if [ $(BUILD_STATIC) = yes ]; then \
-      $(INSTALL) -d '$(HOST_LIBDIR)'; \
-      $(INSTALL) '$(1)/libblas.a' '$(HOST_LIBDIR)/'; \
+      $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \
+      $(INSTALL) '$(1)/libblas.a' '$(3)$(HOST_LIBDIR)/'; \
     fi
 endef