diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-05-05 12:26:18 -0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-05 18:31:29 +0200 |
| commit | 0502f9d575ddb0122bd10d325bd665a8964f5128 (patch) | |
| tree | ff7de90ddc722ad00a6314b59e7f462ffa1fffb0 | |
| parent | 557d978222dc9a904ce43131c0dfbac1411a8236 (diff) | |
| download | meta-openembedded-0502f9d575ddb0122bd10d325bd665a8964f5128.tar.gz | |
dbench: Fix out of tree build
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@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-benchmark/dbench/files/destdir.patch | 4 | ||||
| -rw-r--r-- | 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 ca9a8ee20..4cd2a35f5 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 | |||
| 19 | - ln -sf dbench.1 $(mandir)/tbench_srv.1 | 19 | - ln -sf dbench.1 $(mandir)/tbench_srv.1 |
| 20 | + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) | 20 | + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) |
| 21 | + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) | 21 | + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) |
| 22 | + ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) | 22 | + ${INSTALLCMD} @top_srcdir@/client.txt $(DESTDIR)$(datadir) |
| 23 | + ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) | 23 | + ${INSTALLCMD} -m644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir) |
| 24 | + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 | 24 | + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 |
| 25 | + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 | 25 | + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 |
| 26 | 26 | ||
diff --git a/meta-oe/recipes-benchmark/dbench/files/makefile.patch b/meta-oe/recipes-benchmark/dbench/files/makefile.patch index 09d619ad3..11fb4ffbd 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 | |||
| 10 | @@ -35,7 +35,7 @@ install: all | 10 | @@ -35,7 +35,7 @@ install: all |
| 11 | ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) | 11 | ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) |
| 12 | ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) | 12 | ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) |
| 13 | ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) | 13 | ${INSTALLCMD} @top_srcdir@/client.txt $(DESTDIR)$(datadir) |
| 14 | - ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) | 14 | - ${INSTALLCMD} -m644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir) |
| 15 | + ${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir) | 15 | + ${INSTALLCMD} -m 644 @top_srcdir@/dbench.1 $(DESTDIR)$(mandir) |
| 16 | ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 | 16 | ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 |
| 17 | ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 | 17 | ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 |
| 18 | 18 | ||