29b6acc8ad1b89ba768559f56246a1ec5c58f1ae markd Fri Jul 19 08:27:30 2019 -0700 obtain HAL include and library from a version-specific directory to allow easily moving to a new version diff --git src/inc/common.mk src/inc/common.mk index 54fdafc..256ed5a 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -52,31 +52,31 @@ else ifneq ($(wildcard /opt/local/lib/libiconv.a),) ICONVLIB=/opt/local/lib/libiconv.a else ICONVLIB=-liconv endif endif # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif # autodetect UCSC installation of hal: ifeq (${HALDIR},) - HALDIR = /hive/groups/browser/hal/halRelease + HALDIR = /hive/groups/browser/hal/halRelease/hal.2015-11-11 ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) HALLIBS=${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halChain.a ${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halLiftover.a ${HALDIR}/lib/halLod.a ${HALDIR}/lib/halLib.a ${HALDIR}/lib/sonLib.a ${HALDIR}/lib/libhdf5_cpp.a ${HALDIR}/lib/libhdf5.a ${HALDIR}/lib/libhdf5_hl.a -lstdc++ HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif # on hgwdev, include HAL by defaults ifeq (${IS_HGWDEV},yes) L+=${HALLIBS}