changeset 1074:82c5eb459a91 draft

Fix generated/oldtoys.h to contain option strings with USE() macros in them.
author Rob Landley <rob@landley.net>
date Sun, 22 Sep 2013 03:37:39 -0500
parents 3c0e653070d8
children 565eba9b549e
files scripts/make.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/make.sh	Sat Sep 21 14:27:26 2013 -0500
+++ b/scripts/make.sh	Sun Sep 22 03:37:39 2013 -0500
@@ -56,7 +56,7 @@
 sed -n -e 's/^USE_[A-Z0-9_]*(/&/p' toys/*/*.c \
 	| sed 's/\(.*TOY(\)\([^,]*\),\(.*\)/\2 \1\2,\3/' | sort -k 1,1 \
 	| sed 's/[^ ]* //'  >> generated/newtoys.h
-sed -n 's/.*(NEWTOY(\([^,]*\), *\("[^,]*"\) *,.*/#define OPTSTR_\1\t\2/p' \
+sed -n -e 's/.*(NEWTOY(\([^,]*\), *\(\("[^"]*"[^,]*\)*\),.*/#define OPTSTR_\1\t\2/p' \
   generated/newtoys.h > generated/oldtoys.h
 
 # Extract list of command letters from processed header file