From ac7ff10e32a16cf9f70f8b20c59196c37395b57e Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Fri, 12 Jun 2009 10:59:59 +0000
Subject: [PATCH] Changed the installation path of musrfit...

---
 src/classes/Makefile.PMusr |  4 ++--
 src/musrgui/musrgui.pro    | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr
index 583153e2..a5f492ae 100644
--- a/src/classes/Makefile.PMusr
+++ b/src/classes/Makefile.PMusr
@@ -50,7 +50,7 @@ PMUSRPATH     = ../include
 MNPATH        = $(ROOTSYS)/include
 GSLPATH       = /usr/include/gsl
 BOOSTPATH     = /usr/include
-FFTW3PATH     = /usr/local/include
+FFTW3PATH     = /usr/include
 LEMPATH       = ../external/TLemRunHeader
 PSIBINPATH    = ../external/MuSR_software/Class_MuSR_PSI
 INCLUDES      = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH)
@@ -174,7 +174,7 @@ musrlib:  $(SHLIB)
 $(LEMLIB): $(LEMOBJS)
 	@echo "---> Building shared library $(LEMLIB) ..."
 	/bin/rm -f $(LEMLIB)
-	$(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB)
+	$(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB) $(LIBS)
 	@echo "done"
 
 $(SHLIB): $(OBJS) $(EXTOBJS)
diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro
index d0fa3d0b..1dd2dae2 100644
--- a/src/musrgui/musrgui.pro
+++ b/src/musrgui/musrgui.pro
@@ -1,17 +1,20 @@
 TEMPLATE = app
 TARGET = musrgui
-target.path = $$(HOME)/analysis/bin
+unix:target.path = $(ROOTSYS)/bin
+macx:target.path = /Applications
+
+exists( /usr/bin/cygwin1.dll ) {
+      QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
+      TARGET = musrgui.exe
+}
+
 INSTALLS += target
 QMAKE_CC = gcc
 QMAKE_CXX = g++
 
-exists( /usr/bin/cygwin1.dll ) {
-      QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
-}
-
 # install path for the XML configuration file
-unix:xml.path = $$(HOME)/analysis/bin/
-win32:xml.path = $$(HOME)/analysis/bin/
+unix:xml.path = $(ROOTSYS)/bin/
+macx:xml.path = $(ROOTSYS)/bin/
 xml.files = musrgui_startup.xml
 INSTALLS += xml