From fb91984b3b0605b39fa8c2bdc7036fc074649742 Mon Sep 17 00:00:00 2001
From: Demi Obenour <demiobenour@gmail.com>
Date: Sat, 24 Sep 2016 23:35:07 -0400
Subject: [PATCH] Simplify some shell code

---
 src/Makefile.am |  3 +--
 src/mkskel.sh   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 815f244..e124836 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,12 +81,11 @@ DISTCLEANFILES = stage1scan.c
 MAINTAINERCLEANFILES = skel.c
 
 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c
-	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $< | \
+	sed 's/4_/a4_/g; s/m4preproc_/m4_/g' $< | \
 	  $(m4) -P -I $(srcdir)						   \
 	    -DFLEX_MAJOR_VERSION=`   echo $(VERSION)|cut -f 1 -d .`	   \
 	    -DFLEX_MINOR_VERSION=`   echo $(VERSION)|cut -f 2 -d .`	   \
 	    -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` |	   \
-	  sed 's/m4postproc_/m4_/g' |					   \
 	  $(SHELL) $(srcdir)/mkskel.sh > $@.tmp
 	mv $@.tmp $@
 
diff --git a/src/mkskel.sh b/src/mkskel.sh
index 02c397a..512f1f9 100755
--- a/src/mkskel.sh
+++ b/src/mkskel.sh
@@ -21,17 +21,16 @@
 #  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 #  PURPOSE.
 
-cat <<!
-/* File created from flex.skl via mkskel.sh */
+echo '/* File created from flex.skl via mkskel.sh */
 
 #include "flexdef.h"
 
-const char *skel[] = {
-!
+const char *skel[] = {'
 
-sed 's/\\/&&/g' | sed 's/"/\\"/g' | sed 's/.*/  "&",/'
+sed 's/m4_/m4preproc_/g
+s/a4_/4_/g
+s/[\\"]/\\&/g
+s/.*/  "&",/'
 
-cat <<!
-  0
-};
-!
+echo '  0
+};'
-- 
2.40.0