b187fa061407e630777ee921a9996059efc31554 angie Wed Dec 7 11:45:10 2011 -0800 Updating local default version of tabix to 0.2.5. diff --git src/inc/common.mk src/inc/common.mk index e50f7b1..b0d9c90 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -74,31 +74,31 @@ SAMINC = ${SAMDIR} endif ifeq (${SAMLIB},) SAMLIB = ${SAMDIR}/libbam.a endif HG_INC += -I${SAMINC} L+=${SAMLIB} HG_DEFS+=-DUSE_BAM ifeq (${KNETFILE_HOOKS},1) HG_DEFS+=-DKNETFILE_HOOKS endif endif # As we do for bam/samtools, so do for tabix. autodetect local installation: ifeq (${TABIXDIR},) - TABIXDIR = /hive/data/outside/tabix/tabix-0.2.3/${MACHTYPE} + TABIXDIR = /hive/data/outside/tabix/tabix-0.2.5/${MACHTYPE} ifneq ($(wildcard ${TABIXDIR}),) KNETFILE_HOOKS=1 endif endif ifeq (${USE_TABIX},) ifneq ($(wildcard ${TABIXDIR}),) USE_TABIX=1 endif endif # libtabix and Angie's KNETFILE_HOOKS extension to it: disabled by default ifeq (${USE_TABIX},1) ifeq (${TABIXINC},) TABIXINC = ${TABIXDIR} endif