From a84a7d5929117d8105b650ff046611537691a660 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue, 14 Dec 2010 11:25:07 +0100
Subject: [PATCH] [wip/openni] fix build on fresh system

Set LIB_DIRS in samples Makefiles to the directory where libraries
are built, not installed.
---
 openni/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openni/Makefile b/openni/Makefile
index 5985a73c..b38e901e 100644
--- a/openni/Makefile
+++ b/openni/Makefile
@@ -44,7 +44,7 @@ SUBST_FILES.output-modules = \
 SUBST_CLASSES += samples
 SUBST_STAGE.samples = post-extract
 SUBST_MESSAGE.samples = Patching the output location for samples programs...
-SUBST_SED.samples = -e 's!BIN_DIR = ../../../Bin!CFG=bin\nCFLAGS+=-O3 -msse3\nLDFLAGS+=-Wl,-rpath,$(OPENNI_LIB)\nLIB_DIRS=$(OPENNI_LIB)\nBIN_DIR=$(OPENNI)!g'
+SUBST_SED.samples = -e 's!BIN_DIR = ../../../Bin!CFG=bin\nCFLAGS+=-O3 -msse3\nLDFLAGS+=-Wl,-rpath,$(OPENNI_LIB)\nLIB_DIRS=$(OPENNI)/lib\nBIN_DIR=$(OPENNI)!g'
 SUBST_FILES.samples = \
 	Platform/Linux-x86/Build/Samples/NiViewer/Makefile \
 	Platform/Linux-x86/Build/Samples/NiAudioSample/Makefile \
@@ -62,7 +62,7 @@ SUBST_FILES.samples = \
 SUBST_CLASSES += lib-samples
 SUBST_STAGE.lib-samples = post-extract
 SUBST_MESSAGE.lib-samples = Patching the output location for sample library...
-SUBST_SED.lib-samples =  -e 's!BIN_DIR = ../../../Bin!CFG=lib\nCFLAGS+=-O3 -msse3\nLDFLAGS+=-Wl,-rpath,$(OPENNI_LIB)\nLIB_DIRS=$(OPENNI_LIB)\nBIN_DIR=$(OPENNI)!g'
+SUBST_SED.lib-samples =  -e 's!BIN_DIR = ../../../Bin!CFG=lib\nCFLAGS+=-O3 -msse3\nLDFLAGS+=-Wl,-rpath,$(OPENNI_LIB)\nLIB_DIRS=$(OPENNI)/lib\nBIN_DIR=$(OPENNI)!g'
 SUBST_FILES.lib-samples = \
 	Platform/Linux-x86/Build/Samples/NiSampleModule/Makefile
 
-- 
GitLab