54986d60f3645bed2511e3f9e5e700074071fe76
angie
  Tue Dec 13 21:26:45 2011 -0800
Updating local default version of samtools to 0.1.18.
diff --git src/inc/common.mk src/inc/common.mk
index b0d9c90..eeb2e90 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -45,31 +45,31 @@
 endif
 ifeq (${PNGLIB},)
   PNGLIB=-lpng
 endif
 
 L+=${PNGLIB}
 HG_INC+=${PNGINCL}
 
 # 32-bit color enabled by default
 ifneq (${COLOR32},0)
     HG_DEFS+=-DCOLOR32
 endif
 
 # autodetect local installation of samtools:
 ifeq (${SAMDIR},)
-  SAMDIR = /hive/data/outside/samtools/svn_${MACHTYPE}/samtools
+  SAMDIR = /hive/data/outside/samtools/samtools-0.1.18/x86_64
   ifneq ($(wildcard ${SAMDIR}),)
      KNETFILE_HOOKS=1
   endif
 endif
 ifeq (${USE_BAM},)
   ifneq ($(wildcard ${SAMDIR}),)
      USE_BAM=1
   endif
 endif
 
 # libbam (samtools, and Angie's KNETFILE_HOOKS extension to it): disabled by default
 ifeq (${USE_BAM},1)
     ifeq (${SAMINC},)
         SAMINC = ${SAMDIR}
     endif