From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 18 May 2003 09:01:47 +0000 (+0000)
Subject: * depgen.sed: Put print command on separate lines from substitution commands,
X-Git-Tag: krb5-1.4-beta1~947
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a75f2cc8ec8c296daa52713b599708bc451b7485;p=krb5.git

* depgen.sed: Put print command on separate lines from substitution commands,
instead of using s///p form.

ticket: 1364

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15458 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index af2e6ae40..3113e1ae0 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-18  Ken Raeburn  <raeburn@mit.edu>
+
+	* depgen.sed: Put print command on separate lines from
+	substitution commands, instead of using s///p form.
+
 2003-05-15  Tom Yu  <tlyu@mit.edu>
 
 	* mkrel: Remote autom4te.cache files.
diff --git a/src/util/depgen.sed b/src/util/depgen.sed
index 6ce34f7b1..3d31db954 100644
--- a/src/util/depgen.sed
+++ b/src/util/depgen.sed
@@ -11,6 +11,15 @@
 # s; $(SRCTOP)/lib/krb5/; $(srcdir)/../;g
 # ...
 
+# Notes:
+# Keep "s..." and "p" commands on separate lines.  The "s///p" form is
+# supposed to print the result if a substitution is done.  When we
+# then alter the pattern space and print other stuff, the IRIX sed
+# seems to omit some of the earlier intended output.  I think we're
+# always doing the substitutions anyways, so always printing should be
+# fine.
+
+
 # Output some mostly-fixed patterns first
 h
 s|^\([^ ]*\) \([^ ]*\) \([^ ]*\) \([^ ]*\) \([^ ]*\)$|# This file is automatically generated by depgen.sed, do not edit it.\
@@ -26,7 +35,8 @@ s|^\([^ ]*\) \([^ ]*\) \([^ ]*\) \([^ ]*\) \([^ ]*\)$|# This file is automatical
 \
 # First, remove redundant leading "//" and "./" ...\
 s;///*;/;g\
-s; \\./; ;g|p
+s; \\./; ;g|
+p
 x
 
 h
@@ -40,7 +50,8 @@ s;\1/[^ ]* ;;g\
 s;\1/[^ ]*$;;g\
 \
 # Recognize $(SRCTOP) and make it a variable reference.\
-# (Is this step needed, given the substitutions below?)|p
+# (Is this step needed, given the substitutions below?)|
+p
 x
 
 # Drop the last (possibly empty?) word, gcc's prefix.  Then save four words.
@@ -65,7 +76,8 @@ s|^\(.*\)$|\
 s; \1/; $(srcdir);g\
 s; $(srcdir)/\.\./; \1/../;\
 \
-# Recognize variants of $(SRCTOP).|p
+# Recognize variants of $(SRCTOP).|
+p
 x
 
 # just process first "word"