]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
speakup: use SPKDIR=$(src) to specify the source directory
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 17 Sep 2024 14:16:37 +0000 (23:16 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Mon, 4 Nov 2024 08:53:09 +0000 (17:53 +0900)
Commit e68a558fb2af ("speakup: Fix building as extmod") was intended
to support building this as an external module.

Since commit b1992c3772e6 ("kbuild: use $(src) instead of
$(srctree)/$(src) for source directory"), $(src) consistently points
to the source directory, regardless of whether it is compiled as an
external module or not.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
drivers/accessibility/speakup/Makefile

index 6f6a83565c0ded227260a93a16243e5ae240fe7a..14ba1cca87f47ea2e5500c02b739084d2b45a091 100644 (file)
@@ -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)