--- a/src/lapack.mk	Sat Jun 08 10:50:13 2013 -0400
+++ b/src/lapack.mk	Sat Jun 08 14:00:35 2013 -0400
@@ -13,19 +13,37 @@
   $(PKG)_DEFAULT_INTEGER_8_FLAG := -fdefault-integer-8
 endif
 
-ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
-  $(PKG)_CMAKE_FLAGS := -G 'MSYS Makefile'
-endif
-
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.netlib.org/lapack/' | \
     $(SED) -n 's_.*>LAPACK, version \([0-9]\.[0-9]\.[0-9]\).*_\1_ip' | \
     head -1
 endef
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
-        $($(PKG)_CMAKE_FLAGS) \
+        -G 'MSYS Makefiles' \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+        -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
+        .
+    $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install
+
+    if [ $(BUILD_SHARED) = yes ]; then \
+      $(INSTALL) '$(1)/lib/liblapack.dll.a' '$(HOST_LIBDIR)/'; \
+      $(INSTALL) '$(1)/lib/liblapack.lib' '$(HOST_LIBDIR)/'; \
+      $(INSTALL) '$(1)/bin/liblapack.dll' '$(HOST_BINDIR)/'; \
+    fi
+    if [ $(BUILD_STATIC) = yes ]; then \
+      $(INSTALL) '$(1)/lib/liblapack.a' '$(HOST_LIBDIR)/'; \
+    fi
+
+    $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' 
+    $(INSTALL) '$(1)/lapack.pc' '$(HOST_LIBDIR)/pkgconfig/'
+
+endef
+else
+define $(PKG)_BUILD
+    cd '$(1)' && cmake \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_AR='$(MXE_AR)' \
         -DCMAKE_RANLIB='$(MXE_RANLIB)' \
@@ -33,3 +51,4 @@
         .
     $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install
 endef
+endif