diff --git a/tecs/makefile b/tecs/makefile
index ddbcfb7b..fe1487bf 100644
--- a/tecs/makefile
+++ b/tecs/makefile
@@ -3,26 +3,38 @@
 #
 # Markus Zolliker, March 2000
 # may now be used on different systems without change M.Z.01.2002
-# This only works with tcsh, not with bash under Linux M.K.01.2003 
 #--------------------------------------------------------------------------
-#------------ for DigitalUnix (add -DFORTIFY to CC_... for fortified version)
-CC_alpha_osf1=cc -std1 -g -warnprotos -I../ -I. -I../hardsup
-FOR_alpha_osf1=f77 -u -g
-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
-CC_i386_linux= gcc -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
-FOR_i386_linux= g77 -u -fvxt -g
-SYS_FILE_i386_linux=sys_linux
-TECLI_LIB_i386_linux=pgplot/libpgplot.a -L/usr/X11R6/lib -lX11
+#------------ for DigitalUnix (add -DFORTIFY to CC_... for fortified version)
+OPT_$(OSTYPE)=ao
+ao_CC=cc -std1 -g -warnprotos -I../ -I. -I../hardsup
+ao_FOR=f77 -u -g
+ao_TECLI_LIB=-L/data/lnslib/lib -lpgplot -lX11 -lXm -so_archive
+ao_SYS_FILE=sys_aunix
+
+#---------- for Redhat linux with tcsh (rita2)
+OPT_($OSTYPE)=lr
+lr_CC= gcc -I/usr/local/include -I. -I../ -I../hardsup -DLINUX -g
+lr_FOR= g77 -u -fvxt -g
+lr_SYS_FILE=sys_linux
+lr_TECLI_LIB=pgplot/libpgplot.a -L/usr/X11R6/lib -lX11
 #------------
 
-CC=$(CC_$(MACHTYPE)_$(OSTYPE))
-FOR=$(FOR_$(MACHTYPE)_$(OSTYPE))
-TECLI_LIB=$(TECLI_LIB_$(MACHTYPE)_$(OSTYPE))
-SYS_FILE=$(SYS_FILE_$(MACHTYPE)_$(OSTYPE))
+#---------- for Redhat linux with bash on llc3 or llc4
+OPT_$(HOSTNAME)=ll
+ll_CC=$(lr_CC)
+ll_FOR=$(lr_FOR)
+ll_SYS_FILE=$(lr_SYS_FILE)
+ll_TECLI_LIB=/afs/psi.ch/project/sinq/linux/pgplot/libpgplot.a \
+             -L/usr/X11R6/lib -lX11
+#------------
+
+OPT=$(OPT_llc3)$(OPT_llc4)$(OPT_linux)$(OPT_osf1)
+
+CC       =$($(OPT)_CC)
+FOR      =$($(OPT)_FOR)
+TECLI_LIB=$($(OPT)_TECLI_LIB)
+SYS_FILE =$($(OPT)_SYS_FILE)
 
 LIBR_OBJ= coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o
 SERV_OBJ= tecs.o coc_server.o tecs_lsc.o tecs_serial.o coc_logfile.o tecs_data.o $(LIBR_OBJ)
@@ -42,6 +54,9 @@ libtecsl.a: $(CLI_OBJ)
 	ar cr libtecsl.a $(CLI_OBJ)
 	ranlib libtecsl.a
 
+test:
+	echo $(CC)x$(OPT)
+
 all: libtecsl.a bin/TecsServer bin/TecsClient bin/keep_running
 
 six: bin/six