X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=README;h=e5e937fc7b1927561953a1992dd32d3285da87cc;hp=ad6c13ef3d53a67268cbf5c924e7ea0d6561ebce;hb=8534ffc15c44bfd2f7a72ee745afd284255d17c7;hpb=6dab8842f384bf88d27d7ec4f328a476abea81e8

diff --git a/README b/README
index ad6c13e..e5e937f 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ style is not very ergonomic.  The main difficulties are:
 
 `subdirmk' is an attempt to solve these problems (and it also slightly
 alleviates some of the boilerplate needed to support out-of-tree
-builds well).
+builds well, and helps a bit with metaprogramming and rule writing).
 
 Basic approach
 --------------
@@ -163,7 +163,8 @@ Substitution syntax
 
 In general & expands to the subdirectory name when used for a
 filename, and to the subdirectory name with / replaced with _ for
-variable names.
+variable names.  (If your variables start with capital letters and
+your filenames with lowercase.  Otherwise, use &/ or &_.)
 
 Note that & is processed *even in makefile comments*.  The substitutor
 does not understand make syntax, or shell syntax, at all.  However,
@@ -202,13 +203,13 @@ In general:
     ^   pathname of this subdirectory in source tree
     ~   pathname of top level of source tree
     /	terminates the path escape } needed if next is
-    _   terminates the var escape  } not lwsp or space)
+    _   terminates the var escape  } not letter or space)
     .   terminates path escape giving dir name (excluding /)
     =	terminates var escape giving only prefix part (rarely needed)
   lwsp  starts multi-word processing (see below)
 
 So pathname syntax is a subset of:
-    '&' [ '^' | '~' ] [ lc | '/' | '.' | '=' ]
+    '&' [ '^' | '~' ] [ lc | '/' | '.' ]
 
 &&		=>	&&		for convenience in shell runes
 
@@ -234,31 +235,17 @@ So pathname syntax is a subset of:
 
 &:include filename		filename should usually be [&]foo.sd.mk
 &:-include filename		tolerate nonexistent file
-	filenames are relative to $(top_srcdir)
-	RHS is &-expanded
+	RHS is &-expanded but filenames are relative to the top
+	srcdir.  This implies that unqualified names are like &~/
+	whereas &/ is like &^/.  &^ and &~ do not work here because
+	they expand to constructions involving literally
+	`$(top_srcdir)', but the RHS is not make-expanded.
 
 &!<lwsp>	disables & until EOL (and then disappears)
 
 &#	delete everything to end of line
 	(useful if the RHS contains unrecognised & constructions)
 
-&:changequote NEWQUOTE
-	changes the escape sequence from & to literally NEWQUOTE
-	NEWQUOTE may be any series of of non-whitespace characters,
-	and is terminated by EOL or lwsp.  The whole line is
-	discarded.
-
-	After this, write NEWQUOTE instead of &, everywhere.
-	The effect is global and lasts until the next setting.
-	It takes effect on &:include'd files too, so maybe set
-	it back before using &:include.
-
-	Notably
-		NEWQUOTENEWQUOTE	=> NEWQUOTENEWQUOTE
-		NEWQUOTE\NEWQUOTE	=> NEWQUOTE
-		NEWQUOTE\$		=> $
-		NEWQUOTE:changequote &	set escape back to &
-
 &TARGETS_things
 	Handled specially.  If mentioned at the start of a line
 	(possibly following whitespace), declares that this
@@ -282,6 +269,24 @@ So pathname syntax is a subset of:
 	`all' is extra special: every directory has an `all'
 	target, which corresponds to &TARGETS.
 
+&:changequote NEWQUOTE
+	changes the escape sequence from & to literally NEWQUOTE
+	NEWQUOTE may be any series of of non-whitespace characters,
+	and is terminated by EOL or lwsp.  The whole line is
+	discarded.
+
+	After this, write NEWQUOTE instead of &, everywhere.
+	The effect is unscoped and lasts until the next setting,
+	or until the end of the current directory's Suffix.sd.mk.
+	It takes effect on &:include'd files too, so maybe set
+	it back before using &:include.
+
+	Notably
+		NEWQUOTENEWQUOTE	=> NEWQUOTENEWQUOTE
+		NEWQUOTE\NEWQUOTE	=> NEWQUOTE
+		NEWQUOTE\$		=> $
+		NEWQUOTE:changequote &	set escape back to &
+
 
 Dollar doubling and macro assistance
 ------------------------------------
@@ -389,7 +394,7 @@ Incorporating this into your project
 Use `git-subtree' to merge the subdirmk/ directory.  You may find it
 useful to symlink the DEVELOPER-CERTIFICATE file (git can store
 symlinks as symlinks - just `git add' the link).  And you probably
-want to mention the situation in your top-level COPYING.
+want to mention the situation in your top-level COPYING and HACKING.
 
 Symlink autogen.sh into your project toplevel.
 
@@ -418,9 +423,10 @@ Makefile.in and rename it to Dir.sd.mk, and add the appropriate
 stuff to configure.ac, and fix everything up.  Leave the existing
 $(MAKE) -C for your existing subdirectories alone.  Then you can
 convert individual subdirectories, or classes of subdirectories, at
-your leisure.  (You must be /sure/ that each subdirectory will be
-entered only once at a time, but your existing recursive make descent
-system should already do that or you already have concurrency bugs.)
+your leisure.  (You must be /sure/ that each recursive (non-subdirmk)
+subdirectory will be entered only once at a time, but your existing
+recursive make descent system should already do that or you already
+have concurrency bugs.)
 
 Aside from this, be very wary of any invocation of $(MAKE) anywhere.
 This is a frequent source of concurrency bugs in recursive make build