fixed some compilation problem if not on ESRF machine

parent ea173aa2
......@@ -78,12 +78,13 @@ endif
# LIMA - ESPIA
############################
ifneq ($(COMPILE_ESPIA),0)
include ../camera/common/espia/include/espia.inc
ESPIA_LDFLAGS := $(LDFLAGS) -L$(ESPIA_DRV_LIB)
ESPIA_LDLIBS := $(LDLIBS) -lespia
ifneq ($(COMPILE_ESPIA),0)
name := espia
espia-objs := ../camera/common/espia/src/Espia.o
version-file := ../camera/common/espia/VERSION
......
......@@ -7,7 +7,11 @@ INSTALL_LIMA_DIR = $(INSTALL_DIR)/Lima
endif
ifndef INSTALL_PLAT
INSTALL_PLAT = $(shell /csadmin/common/scripts/get_os.share)
if test -e /csadmin/common/scripts/get_os.share;then \
INSTALL_PLAT = $(shell /csadmin/common/scripts/get_os.share) \
else \
INSTALL_PLAT = "" \
fi
endif
ifndef INSTALL_PLAT_DIR
......
......@@ -4,28 +4,30 @@ root_name = __path__[0]
csadmin_dirs = ['/csadmin/local', '/csadmin/commmon']
script_get_os = 'scripts/get_compat_os.share'
get_os = None
for d in csadmin_dirs:
aux_get_os = os.path.join(d, script_get_os)
if os.path.exists(aux_get_os):
get_os = aux_get_os
break
if get_os is not None:
compat_plat = os.popen(get_os).readline().strip()
for aux_plat in compat_plat.split():
if aux_plat.strip() in os.listdir(root_name):
plat = aux_plat
break
compat_plat = os.popen(get_os).readline().strip()
for aux_plat in compat_plat.split():
if aux_plat.strip() in os.listdir(root_name):
plat = aux_plat
break
lima_plat = os.path.join(root_name, plat)
__path__.insert(0, lima_plat)
lima_plat = os.path.join(root_name, plat)
__path__.insert(0, lima_plat)
import Core
all_dirs = os.listdir(lima_plat)
all_dirs.remove('Lib')
if get_os is not None:
all_dirs = os.listdir(lima_plat)
all_dirs.remove('Lib')
__all__ = all_dirs
__all__ = all_dirs
del plat, compat_plat, aux_plat, lima_plat, all_dirs
del root_name, csadmin_dirs, get_os, script_get_os, d, aux_get_os
del plat, compat_plat, aux_plat, lima_plat, all_dirs
del os
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment