diff --git a/sinqhm/Makefile b/sinqhm/Makefile
index 61cf4a9a..02619906 100644
--- a/sinqhm/Makefile
+++ b/sinqhm/Makefile
@@ -10,25 +10,25 @@
 #--------------------------------------------------------------------------
 #
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-##FF     = f90
-##CC     = cc
-##CFLAGS = -std -g -warnprotos -I. -I../hardsup
-##BIN    = osf.axp
-##LFLAGS = -L../hardsup -L$PGPLOT_DIR
+FF     = f90
+CC     = cc
+CFLAGS = -std -g -I. -I../hardsup -I$(PGPLOT_DIR)
+BIN    = $(HOME)/bin
+LFLAGS = -L../hardsup -L$PGPLOT_DIR
 #------------ for Linux
-FF     = g77
-CC     = gcc
-CFLAGS = -g -I. -I../hardsup -DLINUX
-BIN    = linux.i686
-LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/usr/X11R6/lib
+## FF     = g77
+## CC     = gcc
+## CFLAGS = -g -I. -I../hardsup -I$(PGPLOT_DIR) -DLINUX
+## BIN    = $(HOME)/bin
+## LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/usr/X11R6/lib
 #------------
 
 #----------------------------------------------------------
 
-all:    $(HOME)/bin/$(BIN)/sinqhm_ctrl \
-        $(HOME)/bin/$(BIN)/sinqhm_client \
-        $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
-        $(HOME)/bin/$(BIN)/lwl_client
+all:    $(BIN)/sinqhm_ctrl \
+        $(BIN)/sinqhm_client \
+        $(BIN)/sinqhm_bootutil_client \
+        $(BIN)/lwl_client
 	@ echo
 	@ echo " This directory contains SINQ histogram memory software."
 	@ echo " The make file will make the histogram memory client programs:"
@@ -45,55 +45,55 @@ all:    $(HOME)/bin/$(BIN)/sinqhm_ctrl \
 
 #----------------------------------------------------------
 
-$(HOME)/bin/$(BIN)/sinqhm_ctrl: SinqHM_def.h sinqhm_ctrl.c
-	@ rm -f $(HOME)/bin/$(BIN)/sinqhm_ctrl.old
-	@ if test -f $(HOME)/bin/$(BIN)/sinqhm_ctrl; then \
-           mv -f $(HOME)/bin/$(BIN)/sinqhm_ctrl \
-                 $(HOME)/bin/$(BIN)/sinqhm_ctrl.old; \
+$(BIN)/sinqhm_ctrl: SinqHM_def.h sinqhm_ctrl.c
+	@ rm -f $(BIN)/sinqhm_ctrl.old
+	@ if test -f $(BIN)/sinqhm_ctrl; then \
+           mv -f $(BIN)/sinqhm_ctrl \
+                 $(BIN)/sinqhm_ctrl.old; \
         fi
-	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_ctrl \
+	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_ctrl \
                    sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
 
-$(HOME)/bin/$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
-	@ rm -f $(HOME)/bin/$(BIN)/sinqhm_client.old
-	@ if test -f $(HOME)/bin/$(BIN)/sinqhm_client; then \
-           mv -f $(HOME)/bin/$(BIN)/sinqhm_client \
-                 $(HOME)/bin/$(BIN)/sinqhm_client.old; \
+$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
+	@ rm -f $(BIN)/sinqhm_client.old
+	@ if test -f $(BIN)/sinqhm_client; then \
+           mv -f $(BIN)/sinqhm_client \
+                 $(BIN)/sinqhm_client.old; \
         fi
-	$(FF) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_client \
+	$(FF) $(CFLAGS) -nofor_main -o $(BIN)/sinqhm_client \
                    sinqhm_client.c $(LFLAGS) -lhlib -lcpgplot -lpgplot -lX11
 
-$(HOME)/bin/$(BIN)/sinqhm_bootutil_client:  SinqHM_def.h \
+$(BIN)/sinqhm_bootutil_client:  SinqHM_def.h \
                    sinqhm_bootutil_client.c
-	@ rm -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client.old
-	@ if test -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client; then \
-           mv -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
-                 $(HOME)/bin/$(BIN)/sinqhm_bootutil_client.old; \
+	@ rm -f $(BIN)/sinqhm_bootutil_client.old
+	@ if test -f $(BIN)/sinqhm_bootutil_client; then \
+           mv -f $(BIN)/sinqhm_bootutil_client \
+                 $(BIN)/sinqhm_bootutil_client.old; \
         fi
-	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
+	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_bootutil_client \
                    sinqhm_bootutil_client.c $(LFLAGS) -lhlib -lX11
 
-$(HOME)/bin/$(BIN)/lwl_client: SinqHM_def.h lwl_client.c
-	@ rm -f $(HOME)/bin/$(BIN)/lwl_client.old
-	@ if test -f $(HOME)/bin/$(BIN)/lwl_client; then \
-           mv -f $(HOME)/bin/$(BIN)/lwl_client \
-                 $(HOME)/bin/$(BIN)/lwl_client.old; \
+$(BIN)/lwl_client: SinqHM_def.h lwl_client.c
+	@ rm -f $(BIN)/lwl_client.old
+	@ if test -f $(BIN)/lwl_client; then \
+           mv -f $(BIN)/lwl_client \
+                 $(BIN)/lwl_client.old; \
         fi
-	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/lwl_client \
+	$(CC) $(CFLAGS) -o $(BIN)/lwl_client \
                    lwl_client.c $(LFLAGS) -lhlib -lX11
 
 #----------------------------------------------------------
 
 clean:
 	- rm -f *.o
-	- rm -f $(HOME)/bin/$(BIN)/sinqhm_ctrl \
-                $(HOME)/bin/$(BIN)/sinqhm_client \
-                $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
-                $(HOME)/bin/$(BIN)/lwl_client
-	- rm -f $(HOME)/bin/$(BIN)/sinqhm_ctrl.old \
-                $(HOME)/bin/$(BIN)/sinqhm_client.old \
-                $(HOME)/bin/$(BIN)/sinqhm_bootutil_client.old \
-                $(HOME)/bin/$(BIN)/lwl_client.old
+	- rm -f $(BIN)/sinqhm_ctrl \
+                $(BIN)/sinqhm_client \
+                $(BIN)/sinqhm_bootutil_client \
+                $(BIN)/lwl_client
+	- rm -f $(BIN)/sinqhm_ctrl.old \
+                $(BIN)/sinqhm_client.old \
+                $(BIN)/sinqhm_bootutil_client.old \
+                $(BIN)/lwl_client.old
 
 #----------------------------------------------------------
 .c.o:
diff --git a/sinqhm/bld b/sinqhm/bld
index 1e3f5844..2a67bb27 100755
--- a/sinqhm/bld
+++ b/sinqhm/bld
@@ -113,35 +113,51 @@
 #		Now follow labels for all the valid instruments.
  dev:
 #----
-	set instr = Devel;  set defn = '-DINST="Devel"';  set direc = Devel/NEW
+	set instr = Devel
+	set defn = '-DINST="Devel" -DDevel'
+	set direc = Devel/NEW
 	goto comn
  dmc:
 #---
-	set instr = DMC;   set defn = '-DINST="DMC"';   set direc = DMC/NEW
+	set instr = DMC
+	set defn = '-DINST="DMC" -DDMC'
+	set direc = DMC/NEW
 	goto comn
  sans:
 #----
-	set instr = SANS;  set defn = '-DINST="SANS"';  set direc = SANS/NEW
+	set instr = SANS
+	set defn = '-DINST="SANS" -DSANS'
+	set direc = SANS/NEW
 	goto comn
  focus:
 #-----
-	set instr = FOCUS; set defn = '-DINST="FOCUS"'; set direc = FOCUS/NEW
+	set instr = FOCUS
+	set defn = '-DINST="FOCUS" -DFOCUS'
+	set direc = FOCUS/NEW
 	goto comn
  hrpt:
 #----
-	set instr = HRPT;  set defn = '-DINST="HRPT"';  set direc = HRPT/NEW
+	set instr = HRPT
+	set defn = '-DINST="HRPT" -DHRPT'
+	set direc = HRPT/NEW
 	goto comn
  trics:
 #-----
-	set instr = TriCS; set defn = '-DINST="TRICS"'; set direc = TRICS/NEW
+	set instr = TriCS
+	set defn = '-DINST="TRICS" -DTRICS'
+	set direc = TRICS/NEW
 	goto comn
  poldi:
 #-----
-	set instr = POLDI; set defn = '-DINST="POLDI"'; set direc = POLDI/NEW
+	set instr = POLDI
+	set defn = '-DINST="POLDI" -DPOLDI'
+	set direc = POLDI/NEW
 	goto comn
  amor:
 #----
-	set instr = AMOR;  set defn = '-DINST="AMOR"';  set direc = AMOR/NEW
+	set instr = AMOR
+	set defn = '-DINST="AMOR" -DAMOR'
+	set direc = AMOR/NEW
 	goto comn
  comn:
 #----