From ad1bbdae728d8d165faed5ee31402ff428a09aed Mon Sep 17 00:00:00 2001
From: Duncan Meacher <duncan.meacher@ligo.org>
Date: Fri, 19 Apr 2019 11:45:39 -0700
Subject: [PATCH] Set GSTLAL_WEBVIS_DIR when building ugly in icc Makefile
---
.../share/O3/optimized/Makefile.ligosoftware_icc_all | 4 ++--
gstlal-ugly/share/vis/Makefile.am | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
index 8f9c092cf7..cdd0695118 100644
--- a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
+++ b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
@@ -316,11 +316,11 @@ $(GSTLALUGLY_TARGET) : $(GSTLAL_TARGET)
@echo $(GREEN)gstlal-ugly$(WHITE) 1>&2
if [ "${GSTLAL_GIT}" = "1" ]; then \
cd $(GSTLAL_REPO)/gstlal-ugly && echo | ./00init.sh ; \
- cd $(GSTLAL_REPO)/gstlal-ugly && ./configure --prefix=$(INSTALL_DIR) --without-doxygen ; \
+ cd $(GSTLAL_REPO)/gstlal-ugly && ./configure --prefix=$(INSTALL_DIR) --without-doxygen --with-webdir=$(GSTLAL_WEBVIS_DIR) ; \
cd $(GSTLAL_REPO)/gstlal-ugly && make -j$(CORES) && make install -j$(CORES) ; \
else \
tar -xzkf $(TAR_DIR)/$(GSTLALUGLY).tar.gz -C $(SRC_DIR) ; \
- cd $(SRC_DIR)/$(GSTLALUGLY) && ./configure --prefix=$(INSTALL_DIR) --without-doxygen ; \
+ cd $(SRC_DIR)/$(GSTLALUGLY) && ./configure --prefix=$(INSTALL_DIR) --without-doxygen --with-webdir=$(GSTLAL_WEBVIS_DIR) ; \
cd $(SRC_DIR)/$(GSTLALUGLY) && make -j$(CORES) && make install -j$(CORES) ; \
fi ;
diff --git a/gstlal-ugly/share/vis/Makefile.am b/gstlal-ugly/share/vis/Makefile.am
index 98dab786de..23b10b23bc 100644
--- a/gstlal-ugly/share/vis/Makefile.am
+++ b/gstlal-ugly/share/vis/Makefile.am
@@ -18,9 +18,3 @@ webvis_SCRIPTS = \
webviscgi_SCRIPTS = \
gstlal \
mobile
-
-dist_pkgdata_DATA = \
- gstlal.css \
- gstlal.html \
- gstlal.js \
- gstlal.png
--
GitLab