diff --git a/tecs/Makefile b/tecs/Makefile
index a86a9647..4512ef14 100644
--- a/tecs/Makefile
+++ b/tecs/Makefile
@@ -5,26 +5,25 @@
 # may now be used on different system without change M.Z.01.2002
 #--------------------------------------------------------------------------
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-CC_alpha_osf1=cc
-CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup
+CC_alpha_osf1=cc -std1 -g -warnprotos -I../ -I. -I../hardsup
+FOR_alpha_osf1=f77 -c -u -g
 TECS_PLOT_alpha_osf1=f90 -c -u -g tecs_plot.f90
 TECLI_LIB_alpha_osf1=-L/data/lnslib/lib -lpgplot -lX11 -lXm -so_archive
 SYS_FILE_alpha_osf1=sys_aunix
 #CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup -DFORTIFY 
 
 #---------- for Redhat linux (change i386_linux to the corresponding $OSTYPE)
-CC_i386_linux= gcc
-CFLAGS_i386_linux= -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
+CC_i386_linux= gcc -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
+FOR_i386_linux= g77 -c -u -fvxt -g
 TECS_PLOT_i386_linux=g77 -c -u -g -ff90 -ffree-form tecs_plot.f
 SYS_FILE_i386_linux=sys_linux
 TECLI_LIB_i386_linux=/usr/users/tascom/zolliker/pgplot/libpgplot.a -L/usr/X11R6/lib -lX11 
 #------------ for Linux (what type of Linux?)
-CC_what_linux=gcc
-CFLAGS_what_linux = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
+CC_what_linux=gcc -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
 #------------
 
 CC=$(CC_$(MACHTYPE)_$(OSTYPE))
-CFLAGS=$(CFLAGS_$(MACHTYPE)_$(OSTYPE))
+FOR=$(FOR_$(MACHTYPE)_$(OSTYPE))
 TECS_PLOT=$(TECS_PLOT_$(MACHTYPE)_$(OSTYPE))
 TECLI_LIB=$(TECLI_LIB_$(MACHTYPE)_$(OSTYPE))
 SYS_FILE=$(SYS_FILE_$(MACHTYPE)_$(OSTYPE))
@@ -37,10 +36,10 @@ TECLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_util.o str.o instr_hosts.o $
 
 
 .f.o:
-	g77 -c -u -fvxt -g $*.f
+	$(FOR) $*.f
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) -c $*.c
 
 libtecsl.a: $(CLI_OBJ)
 	- rm libtecsl.a
@@ -54,21 +53,21 @@ tecs_plot.o: tecs_plot.f90 tecs_plot.f
 
 bin/TecsServer: $(SERV_OBJ)
 	- rm bin/TecsServer
-	$(CC) $(CFLAGS) -o bin/TecsServer $(SERV_OBJ) fortify1.c \
+	$(CC) -o bin/TecsServer $(SERV_OBJ) fortify1.c \
 	  -lm -L../hardsup -lhlib
 
 bin/TecsClient: $(TECLI_OBJ)
-	g77 -o bin/TecsClient -g $(TECLI_OBJ) \
+	$(FOR) -o bin/TecsClient $(TECLI_OBJ) \
            $(TECLI_LIB) -lreadline -ltermcap
 
 six: six.c term.c sys_select.c libtecsl.a
-	$(CC) $(CFLAGS) -o six six.c term.c sys_select.c -L. -ltecsl
+	$(CC) -o six six.c term.c sys_select.c -L. -ltecsl
 
 rstart: rstart.c myc_str.o myc_err.o instr_hosts.o
-	$(CC) $(CFLAGS) -o rstart rstart.c myc_str.o myc_err.o instr_hosts.o
+	$(CC) -o rstart rstart.c myc_str.o myc_err.o instr_hosts.o
 
 bin/keep_running: keep_running.c
-	$(CC) $(CFLAGS) -o bin/keep_running keep_running.c        
+	$(CC) -o bin/keep_running keep_running.c        
 
 clean:
 	- rm *.o