From e4a77e89e38e2ad1bf48991b3292faeac853182c Mon Sep 17 00:00:00 2001
From: Duncan Meacher <duncan.meacher@comp-hd-001.gwave.ics.psu.edu>
Date: Fri, 5 Jan 2018 16:04:04 +0000
Subject: [PATCH] fixed typo in optimized Makefile
---
.../optimised/Makefile.ligosoftware_icc_gstreamer-1.0 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0 b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
index d13ea82ca1..617feb3370 100644
--- a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
+++ b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_gstreamer-1.0
@@ -112,9 +112,9 @@ GSTREAMER_TARGET=$(INSTALL_DIR)/lib/libgstreamer-1.0.so
GSL_2_TARGET=$(INSTALL_DIR)/lib/pkgconfig/gsl.pc.orig
GSL_1_TARGET=$(INSTALL_DIR)/lib/libgsl.so
ORC_TARGET=$(INSTALL_DIR)/lib/liborc-0.4.so
-FFTW_TARGET=$(INSTALL_DIR)/lib/libfftw3.so
#PYFFTW_TARGET=$(INSTALL_DIR)/lib64/python2.7/site-packages/pyfftw/pyfftw.so
PYFFTW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/pyfftw/pyfftw.so
+FFTW_TARGET=$(INSTALL_DIR)/lib/libfftw3.so
# tarballs
GSTLALINSPIRAL_TAR_TARGET=$(TAR_DIR)/$(GSTLALINSPIRAL).tar.gz
@@ -205,9 +205,9 @@ env.sh :
echo "source ${ICC_UWM} intel64" >> $@ ; \
echo 'LDFLAGS_INTEL="-L$${MKLROOT}/lib/intel64"' >> $@ ; \
elif [[ ${CLUSTER} == *"psu.edu" ]] ; then \
- echo "source ${ICC_PSU} intel64" >> $@ ; \
- echo "export LIBRARY_PATH=$${LD_LIBRARY_PATH}" >> $@ ; \
- echo 'LDFLAGS_INTEL="-L$${MKLROOT}/lib/intel64"' >> $@ ; \
+ echo "source ${ICC_PSU} intel64" >> $@ ; \
+ echo 'export LIBRARY_PATH=$${LD_LIBRARY_PATH}' >> $@ ; \
+ echo 'LDFLAGS_INTEL="-L$${MKLROOT}/lib/intel64"' >> $@ ; \
elif [[ ${CLUSTER} == *"atlas.local" ]] ; then \
echo "source ${ICC_ATLAS} intel64" >> $@ ; \
echo 'LDFLAGS_INTEL="-L/opt/intel/2015/lib/intel64 -L/opt/intel/2015/mkl/lib/intel64"' >> $@ ; \
--
GitLab