From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 19:45:50 +0000 (+0000)
Subject: subdirmk: Docs, go back to ^ and ~
X-Git-Tag: subdirmk/0.1~6
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=afecfed56c97d5870f82706e84db5473c5f383f4;hp=1e59a1940a98b26cb77913424f6da767646bcce4

subdirmk: Docs, go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/README b/README
index cfd7ad0..6c9e76b 100644
--- a/README
+++ b/README
@@ -174,22 +174,22 @@ Path construction &-expansions are built from the following:
                       Relative paths in...
                       build     source
                                                        
-  This directory      &         &,
-  Top level           .         &;
+  This directory      &         &^
+  Top level           .         &~
 
 In more detail, with all the various options laid out:
 
       Recommended     Relative paths in...   Absolute paths in...
              for      build     source       build         source
                                                        
-  This       lc       &file     &,file       $(PWD)/&file  $(abs_src)/&file
-  directory  any      &/file    &,/file      $(PWD)&/file  $(abs_src)/&/file
-             several  & f g h   &, f g h     $(addprefix...)
+  This       lc       &file     &^file       $(PWD)/&file  $(abs_src)/&file
+  directory  any      &/file    &^/file      $(PWD)&/file  $(abs_src)/&/file
+             several  & f g h   &^ f g h     $(addprefix...)
                                              
-  Top        lc       file      &;file
-  level      any      file      &;/file      $(PWD)/file   $(abs_src)/file
+  Top        lc       file      &~file
+  level      any      file      &~/file      $(PWD)/file   $(abs_src)/file
              .mk.in   file      $(src)/file  $(PWD)/file   $(abs_src)/file
-             several  f g h     &; f g h     $(addprefix...)
+             several  f g h     &~ f g h     $(addprefix...)
 
 (This assumes you have appropriate make variables src, PWD and
 abs_src.)
@@ -224,11 +224,11 @@ empty string).
 &/		=>	sub/dir/			or nothing
 &=/		=>	sub/dir				or .
 
-&,lc		=>	$(top_srcdir)/sub/dir/lc
-&,/		=>	$(top_srcdir)/sub/dir/
+&^lc		=>	$(top_srcdir)/sub/dir/lc
+&^/		=>	$(top_srcdir)/sub/dir/
 
-&;lc		=>	$(top_srcdir)/lc
-&;/		=>	$(top_srcdir)/
+&~lc		=>	$(top_srcdir)/lc
+&~/		=>	$(top_srcdir)/
 
 In general:
     =	return subdir without delimiter (not allowed with `,' `;')
@@ -244,8 +244,8 @@ So pathname syntax is a subset of:
 \&		=>	&		general escaping mechanism
 
 & thing thing... &
-&, thing thing... &
-&; thing thing... &
+&^ thing thing... &
+&~ thing thing... &
 	Convenience syntax for prefixing multiple filenames.
 	Introduced by & followed by lwsp where lc could go.
 	Each lwsp-separated non-ws word is prefixed by &/ etc.