0194552de065bdba3bd10e71ee86e63df175591d
braney
  Fri Dec 19 13:36:41 2014 -0800
add a wee bit of release control to the hal libraries
diff --git src/inc/common.mk src/inc/common.mk
index 35ad0d1..63ef57f 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -33,42 +33,42 @@
 endif
 
 # autodetect if openssl is installed
 ifeq (${SSLDIR},)
   SSLDIR = /usr/include/openssl
 endif
 ifeq (${USE_SSL},)
   ifneq ($(wildcard ${SSLDIR}),)
      USE_SSL=1
   endif
 endif
 
 
 # autodetect UCSC installation of hal:
 ifeq (${HALDIR},)
-    HALDIR = /hive/groups/browser/hal
+    HALDIR = /hive/groups/browser/hal/halRelease
     ifneq ($(wildcard ${HALDIR}),)
         ifeq (${USE_HAL},)
           USE_HAL=1
         endif
     endif
 endif
 
 ifeq (${USE_HAL},1)
-    HALLIBS=${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halChain.a ${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halLiftover.a ${HALDIR}/hal/lib/halLod.a ${HALDIR}/hal/lib/halLib.a ${HALDIR}/sonLib/lib/sonLib.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_cpp.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_hl.a 
+    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 
     HG_DEFS+=-DUSE_HAL
-    HG_INC+=-I${HALDIR}/hal/chain/inc/
+    HG_INC+=-I${HALDIR}/inc
 endif
 
 
 # libssl: disabled by default
 ifeq (${USE_SSL},1)
     ifneq (${SSL_DIR}, "/usr/include/openssl")
       ifneq ($(UNAME_S),Darwin)
         L+=-L${SSL_DIR}/lib
       endif
         HG_INC+=-I${SSL_DIR}/include
     endif
     # on hgwdev, already using the static library with mysqllient.
     ifeq (${FULLWARN},hgwdev)
        L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5
     else