Restoring original Makefiles, accidentally changed

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

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

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/