diff -ur pythia8215.orig/Makefile pythia8215/Makefile
--- pythia8215.orig/Makefile	2016-01-02 18:44:39.000000000 +0100
+++ pythia8215/Makefile	2016-04-08 06:15:19.969660563 +0200
@@ -97,26 +97,26 @@
 
 # LHAPDF (turn off all warnings for readability).
 $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/$$(LHAPDF%_PLUGIN)
-	$(CXX) -x c++ $< -o $@ -c -MD -w -I$(LHAPDF$*_INCLUDE)\
-	 -I$(BOOST_INCLUDE) $(CXX_COMMON)
+	$(CXX) -x c++ - -o $@ -c -MD -w -I$(LHAPDF$*_INCLUDE)\
+	 -I$(BOOST_INCLUDE) $(CXX_COMMON) < $<
 $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\
-	$(LOCAL_LIB)/libpythia8.a
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
 	$(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
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
 	$(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
-	$(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_COMMON)
+	$(CXX) -x c++ - -o $@ -c -MD -w $(CXX_COMMON) < $<
 $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh;
 $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\
-	$(LOCAL_LIB)/libpythia8.a
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
 	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 $<)
+	 $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) -o $@ $(CXX_COMMON) $(CXX_SHARED)\
+	 $(CXX_SONAME),$(notdir $@); rm $(notdir $<)
 
 # Install (rsync is used for finer control).
 install: all