summaryrefslogtreecommitdiff
path: root/cmd-line-utils/libedit
diff options
context:
space:
mode:
authorlenz@kallisto.local <>2004-01-16 16:22:59 +0100
committerlenz@kallisto.local <>2004-01-16 16:22:59 +0100
commit78fc9ba5d8162b6e49dce1b2575bc6f1acb65137 (patch)
tree42fa2516cc28cbee5f609103beee40a2de1ba687 /cmd-line-utils/libedit
parent1d75d8d5aa329909daf1f60b09846b50e1e8d54f (diff)
downloadmariadb-git-78fc9ba5d8162b6e49dce1b2575bc6f1acb65137.tar.gz
- 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)
Diffstat (limited to 'cmd-line-utils/libedit')
-rw-r--r--cmd-line-utils/libedit/Makefile.am13
-rw-r--r--cmd-line-utils/libedit/makelist.sh (renamed from cmd-line-utils/libedit/makelist)2
2 files changed, 13 insertions, 2 deletions
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
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 <filenames>"
if [ "x$1" = "x" ]