| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From 55802fd187b844f0c114c1657b18482bfc80ec51 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 2 Jul 2019 02:52:31 +0000 |
| 4 | Subject: [PATCH] fix out of tree build failure |
| 5 | |
| 6 | Since commit [116da95 Add the '--version' option to bs_calc.py] applied, |
| 7 | while build out of tree, there is a install failure |
| 8 | ... |
| 9 | |install -m0755 ../../git/tools/bs_calc.py /usr/bin/bscalc |
| 10 | |install: cannot stat '../../git/tools/bs_calc.py': No such file or directory |
| 11 | ... |
| 12 | |
| 13 | The generated bs_calc.py locates in builddir rather than srcdir |
| 14 | |
| 15 | Upstream-Status: Submitted [https://github.com/storaged-project/libbytesize/pull/59] |
| 16 | |
| 17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 18 | --- |
| 19 | tools/Makefile.am | 2 +- |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 21 | |
| 22 | diff --git a/tools/Makefile.am b/tools/Makefile.am |
| 23 | index 08223a8..ae22fed 100644 |
| 24 | --- a/tools/Makefile.am |
| 25 | +++ b/tools/Makefile.am |
| 26 | @@ -5,7 +5,7 @@ dist_man1_MANS = bscalc.man |
| 27 | |
| 28 | install-exec-local: |
| 29 | install -d ${DESTDIR}${bindir} |
| 30 | - install -m0755 ${srcdir}/bs_calc.py ${DESTDIR}${bindir}/bscalc |
| 31 | + install -m0755 ${builddir}/bs_calc.py ${DESTDIR}${bindir}/bscalc |
| 32 | |
| 33 | uninstall-local: |
| 34 | rm ${DESTDIR}${bindir}/bscalc |
| 35 | -- |
| 36 | 2.17.1 |
| 37 | |