From 6838666802b8d0404d9541157c26fbad2f428422 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 2 Nov 2020 16:36:10 +0100 Subject: [PATCH] Revert "updating sls subfolder in normal server bianries" This reverts commit 420343eb31df0eef07c4c194e7428f5c7f0589d1. --- slsDetectorServers/ctbDetectorServer/Makefile | 2 +- slsDetectorServers/eigerDetectorServer/Makefile | 2 +- slsDetectorServers/gotthard2DetectorServer/Makefile | 2 +- slsDetectorServers/gotthardDetectorServer/Makefile | 2 +- slsDetectorServers/jungfrauDetectorServer/Makefile | 2 +- slsDetectorServers/moenchDetectorServer/Makefile | 2 +- slsDetectorServers/mythen3DetectorServer/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/Makefile b/slsDetectorServers/ctbDetectorServer/Makefile index f5d60246f..6d6aab318 100755 --- a/slsDetectorServers/ctbDetectorServer/Makefile +++ b/slsDetectorServers/ctbDetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = bfin-uclinux- CC = $(CROSS)gcc diff --git a/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile index 2501b59e5..04370b148 100755 --- a/slsDetectorServers/eigerDetectorServer/Makefile +++ b/slsDetectorServers/eigerDetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ BLACKFIN_CC = bfin-uclinux-gcc CROSS = powerpc-4xx-softfloat- diff --git a/slsDetectorServers/gotthard2DetectorServer/Makefile b/slsDetectorServers/gotthard2DetectorServer/Makefile index ccdc0c86d..000d778bb 100755 --- a/slsDetectorServers/gotthard2DetectorServer/Makefile +++ b/slsDetectorServers/gotthard2DetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = nios2-buildroot-linux-gnu- CC = $(CROSS)gcc diff --git a/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile index f3ba9cc88..ef245754a 100755 --- a/slsDetectorServers/gotthardDetectorServer/Makefile +++ b/slsDetectorServers/gotthardDetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = bfin-uclinux- CC = $(CROSS)gcc diff --git a/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile index 24f3f38b3..1a225159c 100755 --- a/slsDetectorServers/jungfrauDetectorServer/Makefile +++ b/slsDetectorServers/jungfrauDetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = bfin-uclinux- CC = $(CROSS)gcc diff --git a/slsDetectorServers/moenchDetectorServer/Makefile b/slsDetectorServers/moenchDetectorServer/Makefile index 9d3775b45..a34b3f6b3 100755 --- a/slsDetectorServers/moenchDetectorServer/Makefile +++ b/slsDetectorServers/moenchDetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = bfin-uclinux- CC = $(CROSS)gcc diff --git a/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile index 92f4894d1..c07029041 100755 --- a/slsDetectorServers/mythen3DetectorServer/Makefile +++ b/slsDetectorServers/mythen3DetectorServer/Makefile @@ -1,7 +1,7 @@ current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ -support_lib = ../../slsSupportLib/include/sls/ +support_lib = ../../slsSupportLib/include/ CROSS = nios2-buildroot-linux-gnu- CC = $(CROSS)gcc