diff --git a/tecs/Makefile b/tecs/Makefile
index cd36a9ff..324557ec 100644
--- a/tecs/Makefile
+++ b/tecs/Makefile
@@ -10,18 +10,21 @@ TCLI_OBJ= sys_aunix.o sys_aunix_c.o $(CLI_OBJ)
 TECLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_util.o str.o instr_hosts.o $(TCLI_OBJ)
 
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-#CC=cc
-#CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup -DFORTIFY 
-#CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup
+CC_alpha_osf1=cc
+CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup
+#CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup -DFORTIFY 
 
-#---------- for Redhat linux
-CC= gcc
-CFLAGS= -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
+#---------- for Redhat linux (change redhat_linux to the corresponding $OSTYPE)
+CC_i386_linux= gcc
+CFLAGS_i386_linux= -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
 #------------ for Linux
-##CC=gcc
-##CFLAGS = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
+CC_what_linux=gcc
+CFLAGS_i386_linux = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
 #------------
 
+CC=$(CC_$(MACHTYPE)_$(OSTYPE))
+CFLAGS=$(CFLAGS_$(MACHTYPE)_$(OSTYPE))
+
 .f.o:
 	f77 -c -u -g $*.f
 
@@ -39,17 +42,10 @@ tecs_plot.o: tecs_plot.f90
 	f90 -c -u -g tecs_plot.f90
 
 
-#------------ DigitalUnix4.0D
-#bin/TecsServer: $(LIBR_OBJ) $(SERV_OBJ)
-#	- rm bin/TecsServer
-#	$(CC) $(CFLAGS)  -g -o bin/TecsServer -g $(LIBR_OBJ) $(SERV_OBJ) fortify1.c \
-#          -lm -L../hardsup -lhlib -lfor
-
-#---------- Linux
 bin/TecsServer: $(SERV_OBJ)
 	- rm bin/TecsServer
-	$(CC) $(CFLAGS) -o bin/TecsServer  $(SERV_OBJ) fortify1.c \
-          -lm -L../hardsup -lhlib 
+	$(CC) $(CFLAGS) -o bin/TecsServer $(SERV_OBJ) fortify1.c \
+	  -lm -L../hardsup -lhlib
 
 bin/TecsClient: $(TECLI_OBJ)
 	f77 -o bin/TecsClient -g $(TECLI_OBJ) \