From 16d8c0f11a21cf4e86577d03675aabcdeefd535d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 29 Dec 2019 14:13:52 +0000 Subject: [PATCH] Syntax: Use ${top_srcdir} rather than $(top_srcdir) Again, this makes it possible to use in $-doubled shell runes as well as in make syntax. (Assuming you have made top_srcdir be a shell variable as well as a make variable.) Signed-off-by: Ian Jackson --- README | 12 ++++++------ generate | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index 2b8061b..d9b8cc2 100644 --- a/README +++ b/README @@ -88,13 +88,13 @@ empty string). &= => sub_dir or TOP -&^lc => $(top_srcdir)/sub/dir/lc -&^/ => $(top_srcdir)/sub/dir/ -&^. => $(top_srcdir)/sub/dir +&^lc => ${top_srcdir}/sub/dir/lc +&^/ => ${top_srcdir}/sub/dir/ +&^. => ${top_srcdir}/sub/dir -&~lc => $(top_srcdir)/lc -&~/ => $(top_srcdir)/ -&~. => $(top_srcdir) +&~lc => ${top_srcdir}/lc +&~/ => ${top_srcdir}/ +&~. => ${top_srcdir} In general: ^ pathname of this subdirectory in source tree diff --git a/generate b/generate index ffd3e5d..f571fa1 100755 --- a/generate +++ b/generate @@ -234,8 +234,8 @@ sub process_input_mk ($$$$) { local $err_file=$f; my %srcdirmap = ( - '^' => "\$(top_srcdir)${dir_suffix}", - '~' => "\$(top_srcdir)", + '^' => "\${top_srcdir}${dir_suffix}", + '~' => "\${top_srcdir}", ); my %pfxmap = ( '' => $dir_prefix, -- 2.30.2