src/inc/common.mk 1.65

Index: src/inc/common.mk
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/common.mk,v
retrieving revision 1.64
retrieving revision 1.65
diff -b -B -U 4 -r1.64 -r1.65
--- src/inc/common.mk	20 Jul 2009 23:45:23 -0000	1.64
+++ src/inc/common.mk	2 Aug 2009 18:57:07 -0000	1.65
@@ -26,16 +26,22 @@
     USE_BAM=0
 endif
 
 ifeq (${USE_BAM},1)
-    ifeq (${SAMPATH},)
+    ifeq (${SAMDIR},)
       ifeq (${MACHTYPE},x86_64)
-        SAMPATH = /hive/data/outside/samtools/samtools
+        SAMDIR = /hive/data/outside/samtools/samtools
       else
-        SAMPATH = /hive/data/outside/samtools/samtools/${MACHTYPE}
+        SAMDIR = /hive/data/outside/samtools/samtools/${MACHTYPE}
       endif
     endif
-    HG_INC += -I${SAMPATH}
+    ifeq (${SAMINC},)
+        SAMINC = ${SAMDIR}
+    endif
+    ifeq (${SAMLIB},)
+        SAMLIB = ${SAMDIR}/libbam.a
+    endif
+    HG_INC += -I${SAMINC}
     HG_DEFS+=-DUSE_BAM
 endif
 
 ifeq (${HG_WARN},)