some adaptation to the new Makefiles

src/Makefile

@@ -145,3 +145,5 @@ $(OBJS): %.o: %.cpp
 install: all
 	cp -fvp $(EXEC) $(INSTALLPATH)
 	cp -fvp musrfit_startup.xml $(INSTALLPATH)
+	cp -fvp external/scripts/msr2data $(INSTALLPATH)
+	chmod 755 $(INSTALLPATH)/msr2data

src/musrgui/PAdmin.cpp

@@ -228,11 +228,17 @@ bool PAdminXMLParser::endDocument()
   }
 
   if (fAdmin->getMsrDefaultFilePath().find('$') >= 0) {
-    expandPath(fAdmin->getMsrDefaultFilePath());
+    str = expandPath(fAdmin->getMsrDefaultFilePath());
     if (!str.isEmpty())
       fAdmin->setMsrDefaultFilePath(str);
   }
 
+  if (fAdmin->getTheoFuncPixmapPath().find('$') >=0) {
+    str = expandPath(fAdmin->getTheoFuncPixmapPath());
+    if (!str.isEmpty())
+      fAdmin->setTheoFuncPixmapPath(str);
+  }
+
   return true;
 }
 
@@ -292,9 +298,9 @@ PAdmin::PAdmin()
   QString fln = "./musrgui_startup.xml";
   if (!QFile::exists(fln)) {
     QString path = std::getenv("MUSRFITPATH");
-    QString home = std::getenv("HOME");
+    QString rootsys = std::getenv("ROOTSYS");
     if (path.isEmpty())
-      path = home + "/analysis/bin";
+      path = rootsys + "/bin";
     fln = path + "/musrgui_startup.xml";
   }
   if (QFile::exists(fln)) { // administration file present

src/musrgui/musrgui_startup.xml

@@ -5,7 +5,7 @@
     This is handling default setting parameters for the musrgui.
   </comment>
   <general>
-    <exec_path>$HOME/analysis/bin</exec_path>
+    <exec_path>$ROOTSYS/bin</exec_path>
     <default_save_path>./</default_save_path>
     <msr_default_file_path>$HOME/analysis/musrfit/src/musrgui</msr_default_file_path>
   </general>
@@ -21,7 +21,7 @@
       Starting with &gt;= Qt4.2 this will be linked automatically but until then ...; sorry ;-)
     </help_main>
   </help_section>
-  <func_pixmap_path>/home/nemu/analysis/musrfit/src/musrgui/latex_images</func_pixmap_path>
+  <func_pixmap_path>$HOME/analysis/musrfit/src/musrgui/latex_images</func_pixmap_path>
   <theory_functions>
     <func>
       <name>asymmetry</name>