[PATCH 09/23] speakup: use SPKDIR=$(src) to specify the source directory

Masahiro Yamada posted 23 patches 2 months, 1 week ago
There is a newer version of this series
[PATCH 09/23] speakup: use SPKDIR=$(src) to specify the source directory
Posted by Masahiro Yamada 2 months, 1 week ago
Since commit b1992c3772e6 ("kbuild: use $(src) instead of
$(srctree)/$(src) for source directory"), $(src) consistently points
to the source directory whether this is compiled an as external module
or not.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 drivers/accessibility/speakup/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/accessibility/speakup/Makefile b/drivers/accessibility/speakup/Makefile
index 6f6a83565c0d..14ba1cca87f4 100644
--- a/drivers/accessibility/speakup/Makefile
+++ b/drivers/accessibility/speakup/Makefile
@@ -40,9 +40,7 @@ hostprogs += makemapdata
 makemapdata-objs := makemapdata.o
 
 quiet_cmd_mkmap = MKMAP   $@
-      cmd_mkmap = TOPDIR=$(srctree) \
-		  SPKDIR=$(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD),$(srctree)/drivers/accessibility/speakup) \
-		  $(obj)/makemapdata > $@
+      cmd_mkmap = TOPDIR=$(srctree) SPKDIR=$(src) $(obj)/makemapdata > $@
 
 $(obj)/mapdata.h: $(obj)/makemapdata
 	$(call cmd,mkmap)
-- 
2.43.0
Re: [PATCH 09/23] speakup: use SPKDIR=$(src) to specify the source directory
Posted by Nicolas Schier 1 month, 3 weeks ago
On Tue, Sep 17, 2024 at 11:16:37PM +0900, Masahiro Yamada wrote:
> Since commit b1992c3772e6 ("kbuild: use $(src) instead of
> $(srctree)/$(src) for source directory"), $(src) consistently points
> to the source directory whether this is compiled an as external module
> or not.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  drivers/accessibility/speakup/Makefile | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/accessibility/speakup/Makefile b/drivers/accessibility/speakup/Makefile
> index 6f6a83565c0d..14ba1cca87f4 100644
> --- a/drivers/accessibility/speakup/Makefile
> +++ b/drivers/accessibility/speakup/Makefile
> @@ -40,9 +40,7 @@ hostprogs += makemapdata
>  makemapdata-objs := makemapdata.o
>  
>  quiet_cmd_mkmap = MKMAP   $@
> -      cmd_mkmap = TOPDIR=$(srctree) \
> -		  SPKDIR=$(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD),$(srctree)/drivers/accessibility/speakup) \
> -		  $(obj)/makemapdata > $@
> +      cmd_mkmap = TOPDIR=$(srctree) SPKDIR=$(src) $(obj)/makemapdata > $@
>  
>  $(obj)/mapdata.h: $(obj)/makemapdata
>  	$(call cmd,mkmap)
> -- 
> 2.43.0
> 

Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>