From 1e3b65da6cf8c2388ff5306634b658ed6dff4538 Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Wed, 24 Feb 2010 08:34:44 +0000
Subject: [PATCH] fixed system variable access bugs

---
 src/musredit/musredit.pro | 16 +++++++++-------
 src/musrgui/musrgui.pro   |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/musredit/musredit.pro b/src/musredit/musredit.pro
index cac93e9e..f2ec08e4 100644
--- a/src/musredit/musredit.pro
+++ b/src/musredit/musredit.pro
@@ -1,14 +1,21 @@
 TEMPLATE = app
+
 TARGET = musredit
-unix:target.path = $(ROOTSYS)/bin
+# install path for musredit
+unix:target.path = $$(ROOTSYS)/bin
 macx:target.path = /Applications
 win32:target.path = c:/musrfit/bin
+INSTALLS += target
+
+# This is only needed for SL5.1
+exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) {
+  unix:LIBS += -L/opt/fontconfig-2.8.0/lib/ -lfontconfig
+}
 
 exists( /usr/bin/cygwin1.dll ) {
       QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
 }
 
-INSTALLS += target
 QMAKE_CC = gcc
 QMAKE_CXX = g++
 
@@ -25,11 +32,6 @@ CONFIG += qt \
 
 QT += xml
 
-# This is only needed for SL5.1
-exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) {
-  unix:LIBS += -L/opt/fontconfig-2.8.0/lib/ -lfontconfig
-}
-
 HEADERS = musredit.h \
     PHelp.h \
     PTextEdit.h \
diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro
index e2c41fa6..0b75b544 100644
--- a/src/musrgui/musrgui.pro
+++ b/src/musrgui/musrgui.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = musrgui
-unix:target.path = $(ROOTSYS)/bin
+unix:target.path = $$(ROOTSYS)/bin
 macx:target.path = /Applications
 
 exists( /usr/bin/cygwin1.dll ) {
@@ -12,8 +12,8 @@ QMAKE_CC = gcc
 QMAKE_CXX = g++
 
 # install path for the XML configuration file
-unix:xml.path = $(ROOTSYS)/bin/
-macx:xml.path = $(ROOTSYS)/bin/
+unix:xml.path = $$(ROOTSYS)/bin/
+macx:xml.path = $$(ROOTSYS)/bin/
 xml.files = musrgui_startup.xml
 INSTALLS += xml