rm $rig env var requirement in tools and Makefile

rigsc.446/src/Makefile

@@ -12,8 +12,6 @@ PCA =  cc $(CCFLAGS) -D STATIC_CCFLAGS='"$(CCFLAGS)"' -c -D xsun=1 -I../include/
 LIBS = -lm
 # This is for sin, cos, sqrt etc.
 
-#  Other things are usually not changed by the user
-.INIT:  check$(rig)
 
 # -------------------------------------------------
 #  MACRO DEFINITIONS
@@ -106,9 +104,9 @@ bin:
 
 test: ../test/rigcrf.rig  ../bin/rc ../lib/riglib.a ../bin/anrig ../bin/genrigd
 	(cd ../test;\
-	 $(rig)/rc rigcrf;\
-	 $(rig)/ic rigcrf rigcrf;\
-	 $(rig)/rc  rigcrf -c;\
+	 ../bin/rc rigcrf;\
+	 ../bin/ic rigcrf rigcrf;\
+	 ../bin/rc  rigcrf -c;\
 	 ./rigcrf rigcrf)
 
 ##------------------ Hidden possibilities
@@ -142,23 +140,15 @@ clean:
 ##--------------------------------------
 .c.o:   $(INCLIB_SRC)
 	$(PCA) $< -o $@
-check:
-	@echo '********************************************************'
-	@echo '*' User ERROR: you have not set \"rig\" environment variable to $(PWD)/../bin
-	@echo '********************************************************'
-	____FATAL___ERROR___
-check$(rig):
-	@echo VARIABLE rig have been set to $(rig)
-	@echo ---------------------------------------
 ##----------------------------------------
 # Prepare distribution
 mkdist$(RFILE)$(RDIR):
 	@echo '*** to prepare for distribution write make mkdist RFILE=fff RDIR=/u/vaden/xyz/xyz/'
 mkdist:
 	(cd $(RDIR);\
-	$(rig)/rc $(RFILE);\
-	$(rig)/anrig;\
-	$(rig)/genrigd S -p N.TMP;\
+	../bin/rc $(RFILE);\
+	../bin/anrig;\
+	../bin/genrigd S -p N.TMP;\
 	/bin/rm *.RC2 *.RC4 *.TMP)
 	cp ../include/*  $(RDIR)
 	cp $(DISTLIB) $(RDIR)

rigsc.446/src/rc_.c

@@ -740,7 +740,7 @@ _L97:
     if (V.batfile == NULL)
       _EscIO(FileNotFound);
     fprintf(V.batfile, "#!/bin/csh -f\n");
-
+    fprintf(V.batfile, "if !($?rig) set rig=`dirname \"%s\"`\n", getenv("_"));
     fprintf(V.batfile, "$rig/anrig -p N.TMP\n");
     fprintf(V.batfile, "$rig/genrigd  S -p N.TMP\n");
     fprintf(V.batfile, " cc   -w ");