From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Dec 2019 14:13:52 +0000 (+0000)
Subject: Syntax: Use ${top_srcdir} rather than $(top_srcdir)
X-Git-Tag: v0.6.0~249^2~12
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=16d8c0f11a21cf4e86577d03675aabcdeefd535d;p=secnet.git

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 <ijackson@chiark.greenend.org.uk>
---

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,