Rename ct_c.* to ct_c.*.in. ct_c.sed.in is now processed by sed to

remove comment lines beginning with '#', since some sed programs can't
handle that.  Change config_script so that the directory where the
ct_c.* files can be specified, since those are in the build directory,
instead of the source directory.  (This is all for the sake of System
V sed.  Sigh.)

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

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index e49b5d3d195bc0f5df74ebe435a1317d7765dd83..d9aecc98094d286951f207375fa8c11d547c3475 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jun 28 11:24:20 1995    <tytso@rsx-11.mit.edu>
+
+       * Makefile.in, ct_c.sed.in, ct_c.awk.in, config_script: Rename
+               ct_c.* to ct_c.*.in.  ct_c.sed.in is now processed by sed
+               to remove comment lines beginning with '#', since some sed
+               programs can't handle that.  Change config_script so that
+               the directory where the ct_c.* files can be specified,
+               since those are in the build directory, instead of the
+               source directory.  (This is all for the sake of System V
+               sed's.  Sigh.)
 
 Tue Jun 27 15:46:06 EDT 1995   Paul Park       (pjpark@mit.edu)
        * listen.c(listen_int_handler) - Add argument to conform to signal

diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 0e47112edcfc2c872a26544fc262c0eee7e7f5c4..2290a3635381500780abdb694b51c81c7269d48d 100644 (file)
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -125,7 +125,7 @@ libss.o:    $(OBJS)
        $(CHMOD) -x $@
 
 # program(mk_cmds,$(MKCMDSOBJS), , LEXLIB BSDLIB,$(PROGDIR)) 
-all:: mk_cmds
+all:: mk_cmds ct_c.awk ct_c.sed
 
 #mk_cmds: $(MKCMDSOBJS)
 #      $(CC) $(CFLAGS) -o $@ $(MKCMDSOBJS) $(LEXLIB) $(BSDLIB)
@@ -135,15 +135,15 @@ all:: mk_cmds
 #install::
 #      $(INSTALLPROG) mk_cmds ${DESTDIR}$(PROGDIR)/mk_cmds
 
-mk_cmds: $(srcdir)/mk_cmds.sh $(srcdir)/config_script
-       $(srcdir)/config_script $(srcdir)/mk_cmds.sh $(AWK) $(SED) > mk_cmds
+mk_cmds: $(srcdir)/mk_cmds.sh $(srcdir)/config_script 
+       $(srcdir)/config_script $(srcdir)/mk_cmds.sh . $(AWK) $(SED) > mk_cmds
        chmod 755 mk_cmds       
 
-ct_c.awk: $(srcdir)/ct_c.awk
-       $(CP) $(srcdir)/ct_c.awk ct_c.awk
+ct_c.awk: $(srcdir)/ct_c.awk.in
+       $(CP) $(srcdir)/ct_c.awk.in ct_c.awk
 
-ct_c.sed: $(srcdir)/ct_c.sed
-       $(CP) $(srcdir)/ct_c.sed ct_c.sed
+ct_c.sed: $(srcdir)/ct_c.sed.in
+       $(SED) -e '/^#/d' $(srcdir)/ct_c.sed.in > ct_c.sed
 
 clean::
        $(RM) mk_cmds $(MKCMDSOBJS)

diff --git a/src/util/ss/config_script b/src/util/ss/config_script
index e3de35c878ba8b8c7d75255ba09ee55575d0114f..5add600ede1cc81cdb14d08fb8e63dfc738ea89d 100644 (file)
--- a/src/util/ss/config_script
+++ b/src/util/ss/config_script
@@ -5,21 +5,24 @@
 #              @AWK@
 #              @SED@
 #
-# Usage: config_script <filename> [<awk>] [<sed>]
+# Usage: config_script <filename> [<dir>] [<awk>] [<sed>]
 #
 
 FILE=$1
-AWK=$2
-SED=$3
-
-# Grr.... not all Unix's have the dirname command
-TMP=`echo  $1 | sed -e 's;[^/]*$;;' -e 's/^$/./'`
-DIR=`cd ${TMP}; pwd`
+DIR=$2
+AWK=$3
+SED=$4
 
+if test "${DIR}x" = "x" ; then
+       DIR=.
+fi
+DIR=`cd ${DIR}; pwd`
 if test "${AWK}x" = "x" ; then
        AWK=awk
 fi
 if test "${SED}x" = "x" ; then
        SED=sed
 fi
+
+
 sed -e "s;@DIR@;${DIR};" -e "s;@AWK@;${AWK};" -e "s;@SED@;${SED};" $FILE

diff --git a/src/util/ss/ct_c.awk b/src/util/ss/ct_c.awk.in
similarity index 100%
rename from src/util/ss/ct_c.awk
rename to src/util/ss/ct_c.awk.in

diff --git a/src/util/ss/ct_c.sed b/src/util/ss/ct_c.sed.in
similarity index 100%
rename from src/util/ss/ct_c.sed
rename to src/util/ss/ct_c.sed.in