src/inc/common.mk 1.62

1.62 2009/07/15 20:26:10 angie
Fix to SAMPATH setting: for MACHTYPE other than x86_64, look for a MACHTYPE subdir lib. Also let user's SAMPATH env variable take preference if set.

Index: src/inc/common.mk
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/common.mk,v
retrieving revision 1.61
retrieving revision 1.62
diff -b -B -U 4 -r1.61 -r1.62
--- src/inc/common.mk	24 Jun 2009 19:14:27 -0000	1.61
+++ src/inc/common.mk	15 Jul 2009 20:26:10 -0000	1.62
@@ -26,9 +26,15 @@
     USE_BAM=0
 endif
 
 ifeq (${USE_BAM},1)
+    ifeq (${SAMPATH},)
+      ifeq (${MACHTYPE}, "x86_64")
     SAMPATH = /hive/data/outside/samtools/samtools
+      else
+        SAMPATH = /hive/data/outside/samtools/samtools/${MACHTYPE}
+      endif
+    endif
     HG_INC += -I${SAMPATH}
     HG_DEFS+=-DUSE_BAM
 endif