From 17ed23e423887d301860025b4f219f0ed473095a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 23 Apr 2017 15:43:49 +0000
Subject: [PATCH] jcs: Attempt to fix jcs not in sudo path

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/jcs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/jcs b/scripts/jcs
index 69e4f6ab..729ebe68 100644
--- a/scripts/jcs
+++ b/scripts/jcs
@@ -1920,6 +1920,7 @@ INF           := $(wildcard *.inf)
 INF_DONE      := $(addsuffix .done,$(basename $(INF)))
 INF_SU_DONE   := $(addsuffix .su_done,$(basename $(INF)))
 JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path)
+JCS           := /opt/jw-build/bin/jcs
 
 export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR
 
@@ -1938,11 +1939,11 @@ define recurse_subdirs
 endef
 
 %.done: %.inf
-	sudo jcs install $<
+	sudo $(JCS) install $<
 	touch $@
 
 %.su_done: %.inf
-	sudo jcs install -b setup -f $<
+	sudo $(JCS) install -b setup -f $<
 	touch $@
 
 install_inf: $(INF_DONE)
@@ -1950,7 +1951,7 @@ install_inf: $(INF_DONE)
 install_inf.old: checkroot checkdirs
 	@echo "####" checking installation information files ... ;\
 	if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
-		sudo jcs install *.inf ;\
+		sudo $(JCS) install *.inf ;\
 	fi |  $(TEE) -a $(INSTALL_LOG)
 
 install_link:
@@ -1958,7 +1959,7 @@ install_link:
 install_link.old: checkroot checkdirs
 	@echo "####" checking link information files ... ;\
 	if [ -e link.sh ] ; then \
-		jcs linkout link.sh -b install ;\
+		$(JCS) linkout link.sh -b install ;\
 	fi | $(TEE) -a $(INSTALL_LOG)
 
 setup_inf: $(INF_SU_DONE)
@@ -1966,30 +1967,30 @@ setup_inf: $(INF_SU_DONE)
 setup_inf.old: checkroot checkdirs
 	@echo "####" checking installation information files ... ;\
 	if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
-		sudo jcs install -b setup -f *.inf ;\
+		sudo $(JCS) install -b setup -f *.inf ;\
 	fi | $(TEE) -a $(SETUP_LOG)
 
 setup_link: checkroot checkdirs
 	@echo "####" checking link information files ... ;\
 	if [ -e link.sh ] ; then \
-		jcs linkout -f -b setup link.sh ;\
+		$(JCS) linkout -f -b setup link.sh ;\
 	fi | $(TEE) -a $(SETUP_LOG)
 
 test_inf: checkdirs
 	@echo "####" testing installation information files ... ;\
 	if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
-		sudo jcs install *.inf -t ;\
+		sudo $(JCS) install *.inf -t ;\
 	fi | $(TEE) -a $(INSTALL_LOG)
 
 test_link: checkdirs
 	@echo "####" testing link information files ... ;\
 	if [ -e link.sh ] ; then \
-		jcs linkout -t link.sh ;\
+		$(JCS) linkout -t link.sh ;\
 	fi | $(TEE) -a $(INSTALL_LOG)
 
 get: checkdirs
 	@echo "####" getting files. ;\
-	if [ -n "$(GETFILES)" ] ; then jcs get $(GETFILES) ; fi
+	if [ -n "$(GETFILES)" ] ; then $(JCS) get $(GETFILES) ; fi
 
 getall: $(LOCAL_GET) get $(LOCAL_POST_GET)
 	$(recurse_subdirs)
@@ -2058,7 +2059,7 @@ include /etc/jcs/jcs.mk
 # jannet configuration shadow
 # (c) 2000 jannet
 # contact@jannet.de
-MAKE_SH := jcs smake
+MAKE_SH := /opt/jw-build/bin/jcs smake
  
 SUBDIRS = cur