[oe] [meta-oe][PATCH] dbench: Fix out of tree build
Otavio Salvador
otavio at ossystems.com.br
Mon May 5 15:26:18 UTC 2014
This fixes the Makefile so the client.txt file is copied from the
original source tree. This fixes the out of tree build error.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
meta-oe/recipes-benchmark/dbench/files/destdir.patch | 4 ++--
meta-oe/recipes-benchmark/dbench/files/makefile.patch | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-benchmark/dbench/files/destdir.patch b/meta-oe/recipes-benchmark/dbench/files/destdir.patch
index ca9a8ee..4cd2a35 100644
--- a/meta-oe/recipes-benchmark/dbench/files/destdir.patch
+++ b/meta-oe/recipes-benchmark/dbench/files/destdir.patch
@@ -19,8 +19,8 @@ Index: dbench-3.04/Makefile.in
- ln -sf dbench.1 $(mandir)/tbench_srv.1
+ ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)
+ ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
-+ ${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
-+ ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
++ ${INSTALLCMD} @top_srcdir@/client.txt $(DESTDIR)$(datadir)
++ ${INSTALLCMD} -m644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir)
+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
diff --git a/meta-oe/recipes-benchmark/dbench/files/makefile.patch b/meta-oe/recipes-benchmark/dbench/files/makefile.patch
index 09d619a..11fb4ff 100644
--- a/meta-oe/recipes-benchmark/dbench/files/makefile.patch
+++ b/meta-oe/recipes-benchmark/dbench/files/makefile.patch
@@ -10,9 +10,9 @@ Index: dbench-4.0/Makefile.in
@@ -35,7 +35,7 @@ install: all
${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)
${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
- ${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
-- ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
-+ ${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir)
+ ${INSTALLCMD} @top_srcdir@/client.txt $(DESTDIR)$(datadir)
+- ${INSTALLCMD} -m644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir)
++ ${INSTALLCMD} -m 644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir)
ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
--
2.0.0.rc0
More information about the Openembedded-devel
mailing list