Index: trunk/Mars/Makefile
===================================================================
--- trunk/Mars/Makefile	(revision 17127)
+++ trunk/Mars/Makefile	(revision 17246)
@@ -99,5 +99,5 @@
 SRCFILES = \
 	   mcore/izstream.h \
-	   mcore/ofits.h \
+	   mcore/factofits.h \
 	   mcore/factfits.h \
 	   mcore/DrsCalib.h \
@@ -126,5 +126,5 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
 	@echo " Linking shared object $@ ..."
-	$(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
+	$(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
 	mv ${RNDMNAME} $@
 	chmod go+r $@
@@ -135,5 +135,5 @@
 $(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
 	@echo " Linking $@ ..." 
-	$(CXX) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
+	$(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
 
 # Use this to link the programs statically - for gprof
@@ -144,9 +144,9 @@
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
 	@echo " Linking dylib $(DYLIB) ..."
-	$(CXX) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+	$(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
 $(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
 	@echo " Linking mac executable $@ ..." 
-	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+	$(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
 endif