Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9562)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9563)
@@ -19,12 +19,20 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/03/30 Thomas Bretz
+
+   * Makefile.conf.general:
+     - moved ARCHDEFS from DEFINES to CXXFLAGS otherwise it might get
+       ignored
+
+
+
  2010/03/01 Stefan Ruegamer
 
-   * resources/hilocalib.rc
+   * resources/hilocalib.rc:
      - added df factors for p23-25, using the same as for p22. Sequences
        are not running with df in these periods, therefore the correct
        factors cannot be determined, and it doesn't matter anyway.
 
-   * datacenter/read_lapalma-tapes
+   * datacenter/read_lapalma-tapes:
      - added automationsetup before movingrawfiles
 
Index: /trunk/MagicSoft/Mars/Makefile.conf.general
===================================================================
--- /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 9562)
+++ /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 9563)
@@ -19,7 +19,7 @@
 OSTYPE   = $(shell uname -s | tr '[:upper:]' '[:lower:]')
 
-DEFINES	 := -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
+DEFINES	 := -DMARSVER=\"\<cvs\>\" -D__MARS__ $(MARSDEFINES)
 
-CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
+CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(ARCHDEF) $(DEFINES)
 CFLAGS   = $(CXXFLAGS) $(MARSFLAGS)
 FFLAGS   = $(CXXFLAGS)