diff mbox

[mtd-utils] Makefile: install: don't look for scripts in BUILDDIR

Message ID 1453844216-133634-1-git-send-email-computersforpeace@gmail.com
State Accepted
Commit 90f2151eb19757a27af2dd710237e69a64740c12
Headers show

Commit Message

Brian Norris Jan. 26, 2016, 9:36 p.m. UTC
Our ${SCRIPTS} (e.g., flash_eraseall) are not found in the build
directory; they should be found in their original location.

This fixes a typo in the Makefile refactoring, which caused 'make
install' to fail with messages like:

  make: *** No rule to make target '[...my source-build directory...]/armv7a-cros-linux-gnueabi/misc-utils/flash_eraseall'. Stop.

because the install target is looking in the wrong place for
flash_eraseall.

Fixes: 7d81790ced34 ("mtd-utils: Restructure the mtd-utils source.")
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dongsheng Yang Jan. 27, 2016, 12:42 a.m. UTC | #1
On 01/27/2016 05:36 AM, Brian Norris wrote:
> Our ${SCRIPTS} (e.g., flash_eraseall) are not found in the build
> directory; they should be found in their original location.
>
> This fixes a typo in the Makefile refactoring, which caused 'make
> install' to fail with messages like:

Ooooops, yes, it's my typo. Sorry for that.

Reviewed-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>

Thanx
Yang
>
>    make: *** No rule to make target '[...my source-build directory...]/armv7a-cros-linux-gnueabi/misc-utils/flash_eraseall'. Stop.
>
> because the install target is looking in the wrong place for
> flash_eraseall.
>
> Fixes: 7d81790ced34 ("mtd-utils: Restructure the mtd-utils source.")
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
> ---
>   Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index bd9504ae72f0..977c9c5056ed 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -67,7 +67,7 @@ endif
>   	rm -f $(BUILDDIR)/include/version.h
>   	$(MAKE) -C $(TESTS) clean
>
> -install:: $(addprefix $(BUILDDIR)/,${BINS} ${SCRIPTS})
> +install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS}
>   	mkdir -p ${DESTDIR}/${SBINDIR}
>   	install -m 0755 $^ ${DESTDIR}/${SBINDIR}/
>   	mkdir -p ${DESTDIR}/${MANDIR}/man1
>
Brian Norris Jan. 27, 2016, 1:06 a.m. UTC | #2
On Wed, Jan 27, 2016 at 08:42:38AM +0800, Dongsheng Yang wrote:
> Reviewed-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>

Thanks! Applied to mtd-utils.git
diff mbox

Patch

diff --git a/Makefile b/Makefile
index bd9504ae72f0..977c9c5056ed 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@  endif
 	rm -f $(BUILDDIR)/include/version.h
 	$(MAKE) -C $(TESTS) clean
 
-install:: $(addprefix $(BUILDDIR)/,${BINS} ${SCRIPTS})
+install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS}
 	mkdir -p ${DESTDIR}/${SBINDIR}
 	install -m 0755 $^ ${DESTDIR}/${SBINDIR}/
 	mkdir -p ${DESTDIR}/${MANDIR}/man1