From 0f1d93ba93e019cb355f81bcdfb706ff87c92e46 Mon Sep 17 00:00:00 2001
From: Juan David Gonzalez Cobas <dcobas@cern.ch>
Date: Thu, 17 Dec 2015 10:04:44 +0100
Subject: [PATCH] add installation logic for CO paths

We override the /lib and /usr/local/include defaults to fit our wicked
environment
---
 pickering-lxi/Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pickering-lxi/Makefile b/pickering-lxi/Makefile
index 2bbb658e..dde7ad53 100644
--- a/pickering-lxi/Makefile
+++ b/pickering-lxi/Makefile
@@ -21,8 +21,6 @@ GG=g++
 # General
 CURDIR=`pwd`
 MACHINE=$(shell hostname)
-LIBDIR=/lib
-INCSYSDIR=/usr/local/include
 BINDIR=bin
 OBJSDIR=$(BINDIR)/objects
 DOCDIR=Docs
@@ -30,6 +28,11 @@ INCOPT=-I./src/Picmlx -I./src/Piplx -I./src/Pipslx -I./src/Pi743lx
 LINKOPTS=-lpthread -ldl
 CFLAGS_MODULES_DEBUG=
 
+# standard deployment paths
+LIBROOT ?= /acc/local/$(CPU)/drv/pickering-lxi/$(DISTRO_VERSION)
+LIBDIR ?= $(LIBROOT)/lib
+INCSYSDIR ?= $(LIBROOT)/include/pickering-lxi
+
 # Picmlx - Communication module
 PICMLX_VERSION=$(shell grep "\#define *PICMLX_MODULE_VERSION" src/Picmlx/Picmlx.cpp | sed 's/\r$$//'\
  | sed 's/[ \t]*[ \t]/ /g' | cut -f3 -d' '\
@@ -100,7 +103,10 @@ setup:
 	@if test ! -d $(BINDIR) ; then mkdir $(BINDIR) ; fi
 	@if test ! -d $(OBJSDIR) ; then mkdir $(OBJSDIR) ; fi
 
-install:	
+$(LIBDIR) $(INCSYSDIR):
+	mkdir -p $@
+
+install: $(LIBDIR) $(INCSYSDIR)
 	cp $(BINDIR)/lib$(PICMLX).so.$(PICMLX_VERSION) $(LIBDIR)
 	ln -s $(LIBDIR)/lib$(PICMLX).so.$(PICMLX_VERSION) $(LIBDIR)/lib$(PICMLX).so
 	cp $(BINDIR)/lib$(PIPLX).so.$(PIPLX_VERSION) $(LIBDIR)
-- 
GitLab