changeset: 6478:eb4aaf4581ac user: David Champion <[email protected]> date: Tue Aug 11 11:20:10 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/eb4aaf4581ac
Fix txt2c.sh sed invocations to use posix syntax. changeset: 6479:55ea6e829b46 user: Kevin McCarthy <[email protected]> date: Tue Aug 11 11:20:15 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/55ea6e829b46 Compile txt2c using automake rules. The compilation rule used $< which isn't portable for ordinary make rules. diffs (40 lines): diff -r 711708700602 -r 55ea6e829b46 Makefile.am --- a/Makefile.am Fri Aug 07 03:38:48 2015 +0200 +++ b/Makefile.am Tue Aug 11 11:20:15 2015 -0700 @@ -89,15 +89,14 @@ mutt_md5_CFLAGS = -DMD5UTIL mutt_md5_LDADD = -noinst_PROGRAMS = $(MUTT_MD5) +txt2c_SOURCES = txt2c.c +txt2c_LDADD = + +noinst_PROGRAMS = $(MUTT_MD5) txt2c mutt_dotlock.c: dotlock.c cp $(srcdir)/dotlock.c mutt_dotlock.c -# If this fails, we will fall back to the implementation in txt2c.sh -txt2c: txt2c.c - -$${NATIVECC-$(CC)} -o $@ $< - conststrings.c: txt2c config.status ( \ $(CC) -v || \ diff -r 711708700602 -r 55ea6e829b46 txt2c.sh --- a/txt2c.sh Fri Aug 07 03:38:48 2015 +0200 +++ b/txt2c.sh Tue Aug 11 11:20:15 2015 -0700 @@ -13,9 +13,9 @@ sed \ -e 's/\\/\\\\/g' \ -e 's/"/\\"/g' \ - -e 's/??/\?\?/g' \ - -e 's/\t/\\t/'g \ - -e 's/\r/\\r/g' \ + -e 's/??/\\?\\?/g' \ + -e 's/ /\\t/'g \ + -e 's/ /\\r/g' \ -e 's/^/ "/g' \ -e 's/$/\\n"/g' echo ";"
