diff mbox series

[v2] tools: PCI: Fix installation when `make tools/pci_install`

Message ID 20190709161359.15874-1-andriy.shevchenko@linux.intel.com
State Accepted
Headers show
Series [v2] tools: PCI: Fix installation when `make tools/pci_install` | expand

Commit Message

Andy Shevchenko July 9, 2019, 4:13 p.m. UTC
The commit c9a707875053 ("tools pci: Do not delete pcitest.sh in 'make clean'")
fixed a `make tools clean` issue and simultaneously brought a regression
to the installation process:

  for script in .../tools/pci/pcitest.sh; do	\
	install $script .../usr/usr/bin;	\
  done
  install: cannot stat '.../tools/pci/pcitest.sh': No such file or directory

Here is the missed part of the fix.

Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
---
- addressed Kishon's comment
- appended his Ack
 tools/pci/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Lorenzo Pieralisi July 9, 2019, 4:43 p.m. UTC | #1
On Tue, Jul 09, 2019 at 07:13:59PM +0300, Andy Shevchenko wrote:
> The commit c9a707875053 ("tools pci: Do not delete pcitest.sh in 'make clean'")
> fixed a `make tools clean` issue and simultaneously brought a regression
> to the installation process:
> 
>   for script in .../tools/pci/pcitest.sh; do	\
> 	install $script .../usr/usr/bin;	\
>   done
>   install: cannot stat '.../tools/pci/pcitest.sh': No such file or directory
> 
> Here is the missed part of the fix.
> 
> Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>
> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> - addressed Kishon's comment
> - appended his Ack
>  tools/pci/Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Thank you Andy, merged in pci/misc for v5.3, thanks.

Lorenzo

> diff --git a/tools/pci/Makefile b/tools/pci/Makefile
> index 6876ee4bd78c..4b95a5176355 100644
> --- a/tools/pci/Makefile
> +++ b/tools/pci/Makefile
> @@ -18,7 +18,6 @@ ALL_TARGETS := pcitest
>  ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
>  
>  SCRIPTS := pcitest.sh
> -ALL_SCRIPTS := $(patsubst %,$(OUTPUT)%,$(SCRIPTS))
>  
>  all: $(ALL_PROGRAMS)
>  
> @@ -47,10 +46,10 @@ clean:
>  
>  install: $(ALL_PROGRAMS)
>  	install -d -m 755 $(DESTDIR)$(bindir);		\
> -	for program in $(ALL_PROGRAMS) pcitest.sh; do	\
> +	for program in $(ALL_PROGRAMS); do		\
>  		install $$program $(DESTDIR)$(bindir);	\
>  	done;						\
> -	for script in $(ALL_SCRIPTS); do		\
> +	for script in $(SCRIPTS); do			\
>  		install $$script $(DESTDIR)$(bindir);	\
>  	done
>  
> -- 
> 2.20.1
>
diff mbox series

Patch

diff --git a/tools/pci/Makefile b/tools/pci/Makefile
index 6876ee4bd78c..4b95a5176355 100644
--- a/tools/pci/Makefile
+++ b/tools/pci/Makefile
@@ -18,7 +18,6 @@  ALL_TARGETS := pcitest
 ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
 
 SCRIPTS := pcitest.sh
-ALL_SCRIPTS := $(patsubst %,$(OUTPUT)%,$(SCRIPTS))
 
 all: $(ALL_PROGRAMS)
 
@@ -47,10 +46,10 @@  clean:
 
 install: $(ALL_PROGRAMS)
 	install -d -m 755 $(DESTDIR)$(bindir);		\
-	for program in $(ALL_PROGRAMS) pcitest.sh; do	\
+	for program in $(ALL_PROGRAMS); do		\
 		install $$program $(DESTDIR)$(bindir);	\
 	done;						\
-	for script in $(ALL_SCRIPTS); do		\
+	for script in $(SCRIPTS); do			\
 		install $$script $(DESTDIR)$(bindir);	\
 	done