--- a/src/arpack.mk	Sun May 26 13:32:22 2013 -0400
+++ b/src/arpack.mk	Tue May 28 17:31:59 2013 -0400
@@ -9,6 +9,10 @@
 $(PKG)_URL      := http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/$($(PKG)_FILE)
 $(PKG)_DEPS     := blas lapack
 
+ifeq ($(USE_PIC_FLAG),yes)
+  $(PKG)_CONFIGURE_PIC_OPTION := --with-pic
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package arpack.' >&2;
     echo $(arpack_VERSION)
@@ -17,18 +21,19 @@
 define $(PKG)_BUILD
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --enable-static --disable-shared \
+	$($(PKG)_CONFIGURE_PIC_OPTION) \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+
+    if [ $(BUILD_STATIC) = yes ]; then \
+      $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install; \
+    fi
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gfortran' '$(PREFIX)/$(TARGET)/lib/libarpack.a' -llapack -lblas; \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a' '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libarpack.dll' '$(PREFIX)/$(TARGET)/bin/libarpack.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libarpack.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libarpack.la'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)' -llapack -lblas; \
     fi
 endef