slicPandora
diff -u -r1.16 -r1.17
--- Makefile 6 Oct 2010 20:59:54 -0000 1.16
+++ Makefile 6 Oct 2010 21:23:14 -0000 1.17
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2010/10/06 20:59:54 jeremy Exp $
+# $Id: Makefile,v 1.17 2010/10/06 21:23:14 jeremy Exp $
#
# Makefile for the slicPandora project. It requires that
@@ -81,7 +81,7 @@
endif
# Create library and tests.
-all: debug libs tests
+all: libs tests
# Default target.
.DEFAULT: all
@@ -124,7 +124,7 @@
# Compile a test.
$(TESTS):
@echo "Compiling $@ ..."; \
- echo "$(CXX) $(CXXFLAGS) $(RUNLIBS) -o ./bin/$@ $(PWD)[log in to unmask]";
+ $(CXX) $(CXXFLAGS) $(RUNLIBS) -o ./bin/$@ $(PWD)[log in to unmask];
# Clean up the object files and build directories.
clean:
slicPandora
diff -u -r1.7 -r1.8
--- make_setup_script.sh 6 Oct 2010 20:59:54 -0000 1.7
+++ make_setup_script.sh 6 Oct 2010 21:23:14 -0000 1.8
@@ -31,8 +31,7 @@
if [ -n "$PANDORAMONITORING" ]; then
echo "PANDORAMONITORING=$PANDORAMONITORING"
echo -e "export PANDORAMONITORING=$PANDORAMONITORING" >> mysetup.sh
- echo -e \
- "export LD_LIBRARY_PATH=\${PANDORAMONITORING}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
+ echo -e "export LD_LIBRARY_PATH=\${PANDORAMONITORING}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
else
echo "The PANDORAMONITORING variable is not set."
exit 1
@@ -42,8 +41,8 @@
if [ -n "$ROOTSYS" ]; then
echo "ROOTSYS=$ROOTSYS"
echo "export ROOTSYS=$ROOTSYS" >> mysetup.sh
- echo -e \
- "export LD_LIBRARY_PATH=\${ROOTSYS}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
+ echo -e "export LD_LIBRARY_PATH=\${ROOTSYS}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
+ echo -e "export PATH=\${ROOTSYS}/bin:\${PATH}" >> mysetup.sh
else
echo "The ROOTSYS variable is not set."
exit 1