diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-06-28 18:28:11 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-06-28 18:28:11 +0000 |
| commit | 966b47e499faefe16dc615ac4df920f95131db6d (patch) | |
| tree | 7abe8dfdf5d2406d4a07e24266fe425ed022aadc | |
| parent | f33c01c4c2c38f1c3ec1e1418ea6e158a6b50b16 (diff) | |
| download | krb5-966b47e499faefe16dc615ac4df920f95131db6d.tar.gz krb5-966b47e499faefe16dc615ac4df920f95131db6d.tar.xz krb5-966b47e499faefe16dc615ac4df920f95131db6d.zip | |
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
| -rw-r--r-- | src/util/ss/ChangeLog | 10 | ||||
| -rw-r--r-- | src/util/ss/Makefile.in | 14 | ||||
| -rw-r--r-- | src/util/ss/config_script | 17 | ||||
| -rw-r--r-- | src/util/ss/ct_c.awk.in (renamed from src/util/ss/ct_c.awk) | 0 | ||||
| -rw-r--r-- | src/util/ss/ct_c.sed.in (renamed from src/util/ss/ct_c.sed) | 0 |
5 files changed, 27 insertions, 14 deletions
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog index e49b5d3d1..d9aecc980 100644 --- 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 0e47112ed..2290a3635 100644 --- 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 e3de35c87..5add600ed 100644 --- 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 index 872f6e007..872f6e007 100644 --- a/src/util/ss/ct_c.awk +++ b/src/util/ss/ct_c.awk.in diff --git a/src/util/ss/ct_c.sed b/src/util/ss/ct_c.sed.in index f99cd7fd2..f99cd7fd2 100644 --- a/src/util/ss/ct_c.sed +++ b/src/util/ss/ct_c.sed.in |