From 2f3f0f20d84bbe72622e30f9669af73eb0a86e78 Mon Sep 17 00:00:00 2001 From: klightspeed Date: Thu, 19 Nov 2009 14:03:05 +0300 Subject: [PATCH] [8838] Avoid attempts to install tbb libraries without honouring $DESTDIR Signed-off-by: VladimirMangos --- dep/tbb/Makefile.am | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dep/tbb/Makefile.am b/dep/tbb/Makefile.am index 98027104a..d85e69268 100644 --- a/dep/tbb/Makefile.am +++ b/dep/tbb/Makefile.am @@ -49,7 +49,7 @@ tbbmalloc: $(MAKE) -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc tbb_root=$(tbb_root) install-exec-local: - $(INSTALL) $(work_dir)/lib*.so* $(libdir) + $(INSTALL) $(work_dir)/lib*.so* $(DESTDIR)$(libdir) clean-local: -rm -f *.d *.o diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 48fc9d6c2..a0d0213ef 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8837" + #define REVISION_NR "8838" #endif // __REVISION_NR_H__