From 3b59469c9e3ff8e82de94eaa91b53a2ef3e2cccc Mon Sep 17 00:00:00 2001
From: cvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 29 May 2008 19:46:58 +0000
Subject: [PATCH] Minor fixes.

---
 Makefile         | 2 +-
 build/MakefileDA | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 85f35aa0300..9656369bb87 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ endif
 # Check if DATE is installed
 
 ifneq ($(shell date-config 2>&1 | grep -i usage),)
-DATEFLAGS  = -DALI_DATE $(shell date-config --cflags)
+DATEFLAGS  = -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
diff --git a/build/MakefileDA b/build/MakefileDA
index d45a0f7c181..f3a5acb0671 100644
--- a/build/MakefileDA
+++ b/build/MakefileDA
@@ -77,7 +77,9 @@ CXXFLAGS  += $(AMOREFLAGS)
 CFLAGS    += $(AMOREFLAGS)
 CINTFLAGS += $(AMOREFLAGS)
 DEPINC    += $(AMOREFLAGS)
-DAQDALIB  += $(shell amore-config --auxlibs)
+AMOREDALIBS+=$(shell amore-config --auxlibs)
+else
+AMOREDALIBS=
 endif
 
 ROOTLIBDIR=$(shell root-config --libdir)
@@ -119,7 +121,7 @@ $(DAEXE): $(DAOBJ) $(LIBPATH) $(DALIB) $(DAQDALIB) $(EXTRAROOTLIB)
 	$(EXTRAROOTLIB) \
 	$(ROOTLIBDIR)/libRoot.a \
 	$(ROOTLIBDIR)/libfreetype.a $(ROOTLIBDIR)/libpcre.a \
-	$(DAQDALIB) $(MONITORLIBS) \
+	$(DAQDALIB) $(MONITORLIBS) $(AMOREDALIBS) \
 	$(SYSLIBS)
 
 $(DAOBJ): $(DASRC) $(DAQDADIR) $(DADEP) $(DATARGETDIR)
@@ -181,6 +183,7 @@ $(DAMAKEFILE): $(DATARGETDIR)
 	@echo "endif" >> $@
 	@echo "" >> $@
 	@echo "DAQDALIB=""$$""(DAQDADIR)/libdaqDA.a" >> $@
+	@echo "AMOREDALIBS=""$$""(shell amore-config --auxlibs)" >> $@
 	@echo "MONITORLIBS=""$$""(shell date-config --monitorlibs=noshift)" >> $@
 	@echo "" >> $@
 	@echo "${DAMODULE}${SUBDAMODULE}${DANAME}da.exe: ${DAMODULE}${SUBDAMODULE}${DANAME}da.o" >> $@
@@ -189,7 +192,7 @@ $(DAMAKEFILE): $(DATARGETDIR)
 	@echo "		$(EXTRAROOTLIB) \\" >> $@
 	@echo "		""$$""(ROOTSYS)/lib/libRoot.a \\" >> $@
 	@echo "		""$$""(ROOTSYS)/lib/libfreetype.a ""$$""(ROOTSYS)/lib/libpcre.a \\" >> $@
-	@echo "		""$$""(DAQDALIB) ""$$""(MONITORLIBS) \\" >> $@
+	@echo "		""$$""(DAQDALIB) ""$$""(MONITORLIBS) ""$$""(AMOREDALIBS) \\" >> $@
 	@echo "		$(SYSLIBS)" >> $@
 	@echo "" >> $@
 	@echo "${DAMODULE}${SUBDAMODULE}${DANAME}da.o: ${DAMODULE}${SUBDAMODULE}${DANAME}da.cxx" >> $@
-- 
2.43.0