diff --git a/Makefile b/Makefile index 6e3a6b9..c710331 100644 --- a/Makefile +++ b/Makefile @@ -64,19 +64,19 @@ ifeq ($(POWHEG_USE),true) endif # Python. -PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) +PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) ifeq ($(PYTHON_USE),true) TARGETS+=$(LOCAL_LIB)/_pythia8.so endif # GZIP. OBJ_COMMON=-MD $(CXX_COMMON) -LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl +LIB_COMMON=-ldl ifeq ($(GZIP_USE),true) PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + PYTHON_COMMON+= -L$(GZIP_LIB) -lz OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + LIB_COMMON+= -L$(GZIP_LIB) -lz endif ################################################################################ @@ -119,11 +119,11 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPDF%.h $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ - -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran + -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\ $(LOCAL_LIB)/libpythia8.a $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ - -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF + -L$(LHAPDF6_LIB) -lLHAPDF # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h @@ -133,7 +133,7 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ - $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) + $(CXX_SONAME)$(notdir $@); rm $(notdir $<) # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h @@ -149,13 +149,13 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h\ # Install (rsync is used for finer control). install: all - mkdir -p $(PREFIX_BIN) $(PREFIX_INCLUDE) $(PREFIX_LIB) $(PREFIX_SHARE) - rm -f $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - rsync -a $(LOCAL_BIN)/* $(PREFIX_BIN) --exclude .svn - rsync -a $(LOCAL_INCLUDE)/* $(PREFIX_INCLUDE) --exclude .svn - rsync -a $(LOCAL_LIB)/* $(PREFIX_LIB) --exclude .svn - rsync -a $(LOCAL_SHARE)/* $(PREFIX_SHARE) --exclude .svn - rsync -a $(LOCAL_EXAMPLE) $(PREFIX_SHARE) --exclude .svn + mkdir -p $(DESTDIR)/$(PREFIX_BIN) $(DESTDIR)/$(PREFIX_INCLUDE) $(DESTDIR)/$(PREFIX_LIB) $(DESTDIR)/$(PREFIX_SHARE) + rm -f $(DESTDIR)/$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + rsync -a $(LOCAL_BIN)/* $(DESTDIR)/$(PREFIX_BIN) --exclude .svn + rsync -a $(LOCAL_INCLUDE)/* $(DESTDIR)/$(PREFIX_INCLUDE) --exclude=".svn" --exclude="._*" + rsync -a $(LOCAL_LIB)/* $(DESTDIR)/$(PREFIX_LIB) --exclude .svn + rsync -a $(LOCAL_SHARE)/* $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn + rsync -a $(LOCAL_EXAMPLE) $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn # Clean. clean: