From 74fd4d8538e41041523100e250bf509e2b56e420 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Sun, 10 Jan 2010 22:20:10 +0000
Subject: [PATCH] A few changes to the previous commit. Basic features should
 work now everywhere (MUD only 32bit)

---
 configure.ac                                  | 4 ++++
 src/external/Nonlocal/Makefile.am             | 2 +-
 src/external/TFitPofB-lib/classes/Makefile.am | 2 +-
 src/external/libCalcMeanFieldsLEM/Makefile.am | 2 +-
 src/external/libGapIntegrals/Makefile.am      | 2 +-
 src/external/libLFRelaxation/Makefile.am      | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 90f3a453..8f7be722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,8 @@ PLUGIN_VERSION=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION.$PLUGIN_MICRO_VERSION
 PLUGIN_RELEASE=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION
 AC_SUBST(PLUGIN_RELEASE)
 AC_SUBST(PLUGIN_VERSION)
+AC_SUBST(PLUGIN_MAJOR_VERSION)
+AC_SUBST(PLUGIN_MINOR_VERSION)
 
 CUBA_VERSION=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION.$CUBA_MICRO_VERSION
 CUBA_RELEASE=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION
@@ -512,9 +514,11 @@ case "$host" in
     ;;
   *-*-darwin*)
     ARCH=DARWIN
+    LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__"
     ;;
   *)
     ARCH=OTHERUNIX
+    LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__"
     ;;
 esac
 
diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am
index 7f1fd10e..81efdec6 100644
--- a/src/external/Nonlocal/Makefile.am
+++ b/src/external/Nonlocal/Makefile.am
@@ -58,7 +58,7 @@ endif
 
 if IS_CYGWIN
 install-exec-hook:
-	$(LN_S) $(libdir)/libPNL_PippardFitter.dll.a $(libdir)/libPNL_PippardFitter.so
+	$(LN_S) $(bindir)/cygPNL_PippardFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPNL_PippardFitter.so
 uninstall-hook:
 	rm -f $(libdir)/libPNL_PippardFitter.so
 endif
diff --git a/src/external/TFitPofB-lib/classes/Makefile.am b/src/external/TFitPofB-lib/classes/Makefile.am
index 18395848..c7ee0720 100644
--- a/src/external/TFitPofB-lib/classes/Makefile.am
+++ b/src/external/TFitPofB-lib/classes/Makefile.am
@@ -75,7 +75,7 @@ endif
 
 if IS_CYGWIN
 install-exec-hook:
-	$(LN_S) $(libdir)/libTFitPofB.dll.a $(libdir)/libTFitPofB.so
+	$(LN_S) $(bindir)/cygTFitPofB-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libTFitPofB.so
 uninstall-hook:
 	rm -f $(libdir)/libTFitPofB.so
 endif
diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am
index 31abb7b3..c6816790 100644
--- a/src/external/libCalcMeanFieldsLEM/Makefile.am
+++ b/src/external/libCalcMeanFieldsLEM/Makefile.am
@@ -50,7 +50,7 @@ endif
 
 if IS_CYGWIN
 install-exec-hook:
-	$(LN_S) $(libdir)/libCalcMeanFieldsLEM.dll.a $(libdir)/libCalcMeanFieldsLEM.so
+	$(LN_S) $(bindir)/cygCalcMeanFieldsLEM-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libCalcMeanFieldsLEM.so
 uninstall-hook:
 	rm -f $(libdir)/libCalcMeanFieldsLEM.so
 endif
diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am
index f1753324..b60a6ec1 100644
--- a/src/external/libGapIntegrals/Makefile.am
+++ b/src/external/libGapIntegrals/Makefile.am
@@ -52,7 +52,7 @@ endif
 
 if IS_CYGWIN
 install-exec-hook:
-	$(LN_S) $(libdir)/libGapIntegrals.dll.a $(libdir)/libGapIntegrals.so
+	$(LN_S) $(bindir)/cygGapIntegrals-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libGapIntegrals.so
 uninstall-hook:
 	rm -f $(libdir)/libGapIntegrals.so
 endif
diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am
index 5fe462a2..b2d93993 100644
--- a/src/external/libLFRelaxation/Makefile.am
+++ b/src/external/libLFRelaxation/Makefile.am
@@ -52,7 +52,7 @@ endif
 
 if IS_CYGWIN
 install-exec-hook:
-	$(LN_S) $(libdir)/libLFRelaxation.dll.a $(libdir)/libLFRelaxation.so
+	$(LN_S) $(bindir)/cygLFRelaxation-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libLFRelaxation.so
 uninstall-hook:
 	rm -f $(libdir)/libLFRelaxation.so
-endif
\ No newline at end of file
+endif