From f7fa4696b246c3b5a4f899b94d1f1263b2e0e1a0 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Fri, 19 Jun 2009 20:40:00 +0000
Subject: [PATCH] Restoring original Makefiles, accidentally changed

---
 src/classes/Makefile.PMusr    | 4 ++--
 src/classes/Makefile.PUserFcn | 4 ++--
 src/musrgui/musrgui.pro       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr
index 7473efb8..a5f492ae 100644
--- a/src/classes/Makefile.PMusr
+++ b/src/classes/Makefile.PMusr
@@ -44,7 +44,7 @@ endif
 
 # -- Linux
 ifeq ($(OS),LINUX)
-CXX           = g++-4.2.4
+CXX           = g++
 CXXFLAGS      = -O3 -Wall -Wno-trigraphs -fPIC
 PMUSRPATH     = ../include
 MNPATH        = $(ROOTSYS)/include
@@ -54,7 +54,7 @@ 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)
-LD            = g++-4.2.4
+LD            = g++
 LDFLAGS       = -O
 SOFLAGS       = -shared
 LEMLIB        = libTLemRunHeader.so
diff --git a/src/classes/Makefile.PUserFcn b/src/classes/Makefile.PUserFcn
index d19e37ee..4ec31d92 100644
--- a/src/classes/Makefile.PUserFcn
+++ b/src/classes/Makefile.PUserFcn
@@ -34,10 +34,10 @@ endif
 
 # -- Linux
 ifeq ($(OS),LINUX)
-CXX           = g++-4.3.3
+CXX           = g++
 CXXFLAGS      = -Wall -Wno-trigraphs -fPIC
 INCLUDES      = -I../include
-LD            = g++-4.3.3
+LD            = g++
 LDFLAGS       = -g
 SOFLAGS       = -O -shared
 endif
diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro
index 8044a327..1dd2dae2 100644
--- a/src/musrgui/musrgui.pro
+++ b/src/musrgui/musrgui.pro
@@ -9,8 +9,8 @@ exists( /usr/bin/cygwin1.dll ) {
 }
 
 INSTALLS += target
-QMAKE_CC = gcc-4.2.4
-QMAKE_CXX = g++-4.2.4
+QMAKE_CC = gcc
+QMAKE_CXX = g++
 
 # install path for the XML configuration file
 unix:xml.path = $(ROOTSYS)/bin/