2967910659157cc5368aa6144ff3dfa64517b8f2
hiram
  Mon Jun 16 09:50:04 2014 -0700
eliminate need for MACHTYPE setting and correct it when incorrect refs #12209
diff --git src/inc/common.mk src/inc/common.mk
index 34c7b79..8c3cb67 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -1,23 +1,33 @@
 CC=gcc
 # to build on sundance: CC=gcc -mcpu=v9 -m64
 ifeq (${COPT},)
     COPT=-O -g
 endif
 ifeq (${CFLAGS},)
     CFLAGS=
 endif
+ifeq (${MACHTYPE},)
+    MACHTYPE:=$(shell uname -m)
+#    $(info MACHTYPE was empty, set to: ${MACHTYPE})
+endif
+ifneq (,$(findstring -,$(MACHTYPE)))
+#    $(info MACHTYPE has - sign ${MACHTYPE})
+    MACHTYPE:=$(shell uname -m)
+#    $(info MACHTYPE has - sign set to: ${MACHTYPE})
+endif
+
 HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE}
 HG_INC=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc
 
 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)
 # to check for builds on hgwdev
 FULLWARN = $(shell uname -n)
 
 #global external libraries 
 L=
 
 # pthreads is required
 ifneq ($(UNAME_S),Darwin)
   L+=-pthread
 endif