2065e018e72d705c542f56f5f1ced49b66d1e562
braney
  Tue Dec 15 12:52:39 2015 -0800
move htslib to a more standard place

diff --git src/inc/common.mk src/inc/common.mk
index c2aca37..95b7ee7 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -207,38 +207,38 @@
 ifeq (${FULLWARN},hgwdev)
   MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.4.4/libstdc++.a /usr/lib/debug/usr/lib64/librt.a
 else
   ifeq ($(UNAME_S),Darwin)
     MYSQLLIBS += -lstdc++
   else
     MYSQLLIBS += -lstdc++ -lrt
   endif
 endif
 
 L+=${PNGLIB}
 HG_INC+=${PNGINCL}
 
 # autodetect UCSC installation of htslib:
 ifeq (${HTSDIR},)
-    HTSDIR = /hive/groups/browser/htslib
+    HTSDIR = /hive/data/outside/htslib/${MACHTYPE}
     ifneq ($(wildcard ${HTSDIR}),)
         ifeq (${USE_HTS},)
             USE_HTS=1
             USE_TABIX=1
             USE_SAMTABIX=1
-            SAMTABIXDIR = /hive/groups/browser/htslib
-            SAMTABIXLIB=/hive/groups/browser/htslib/libhts.a
+            SAMTABIXDIR = ${HTSDIR}
+            SAMTABIXLIB=${HTSDIR}/libhts.a
             HG_DEFS+=-DUSE_HTS
         endif
     endif
 endif
 
 
 # autodetect UCSC installation of samtabix:
 ifeq (${SAMTABIXDIR},)
     SAMTABIXDIR = /hive/data/outside/samtabix/${MACHTYPE}
     ifneq ($(wildcard ${SAMTABIXDIR}),)
         ifeq (${USE_SAMTABIX},)
           USE_SAMTABIX=1
         endif
     endif
 endif