Fixed includes and scope of a string

[u/mrichter/AliRoot.git] / PHOS / Makefile

diff --git a/PHOS/Makefile b/PHOS/Makefile
index 812f23538d9c47344236ccc9923112be27cf72d3..345eaa3e433600bd0f39d572c694aff64fd99d77 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -1,6 +1,6 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 SRCS     = $(wildcard *.cxx)
 HDRS     = $(SRCS:.cxx=.h)
@@ -19,11 +19,11 @@ ifneq ($(STEERBase_INCLUDE),)
 endif
 
 # only if no par file was loaded before
-ifeq ($(ALICEINC),-I.)
+#ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)
     ALICEINC += -I$(ALICE_ROOT)/include
   endif
-endif
+#endif
 
 CXXFLAGS += $(ALICEINC) -g
 
@@ -33,11 +33,7 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(ARCH),macosx)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
-else
-       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
-endif
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
        @chmod a+x $@
        @echo "done"