From 94e6b9be19ecfbb4c541b2f2d49f08ffc351a1ab Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 16 Jan 2004 16:22:59 +0100 Subject: [PATCH] - Fixed BUG#2297: cmd-line-utils/libedit/makelist used a hard-coded call to /usr/bin/awk - replaced this with the proper autoconf variable instead (makelist is now generated out of makelist.sh during the compile phase) cmd-line-utils/libedit/Makefile.am: - replace @AWK@ with the correct path to the awk binary determined by configure instead of using a hard-coded path (BUG#2297) cmd-line-utils/libedit/makelist.sh: - replace @AWK@ with the correct path to the awk binary determined by configure instead of using a hard-coded path (BUG#2297) --- cmd-line-utils/libedit/Makefile.am | 13 ++++++++++++- cmd-line-utils/libedit/{makelist => makelist.sh} | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) rename cmd-line-utils/libedit/{makelist => makelist.sh} (99%) diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index 19171f62ffb..eb6b930c0b2 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -24,10 +24,21 @@ noinst_HEADERS = chared.h el.h histedit.h key.h \ hist.h map.h prompt.h search.h \ strlcpy.h libedit_term.h tty.h -EXTRA_DIST = makelist +EXTRA_DIST = makelist.sh + +CLEANFILES = makelist DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR +SUFFIXES = .sh + +.sh: + @RM@ -f $@ $@-t + @SED@ \ + -e 's!@''AWK''@!@AWK@!' \ + $< > $@-t + @MV@ $@-t $@ + vi.h: vi.c makelist sh ./makelist -h ./vi.c > $@.tmp && \ mv $@.tmp $@ diff --git a/cmd-line-utils/libedit/makelist b/cmd-line-utils/libedit/makelist.sh similarity index 99% rename from cmd-line-utils/libedit/makelist rename to cmd-line-utils/libedit/makelist.sh index 3c3338e9875..13d37512591 100644 --- a/cmd-line-utils/libedit/makelist +++ b/cmd-line-utils/libedit/makelist.sh @@ -39,7 +39,7 @@ # makelist.sh: Automatically generate header files... -AWK=/usr/bin/awk +AWK=@AWK@ USAGE="Usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m " if [ "x$1" = "x" ]