summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-11-04 02:17:11 +0100
committerunknown <kent@mysql.com>2005-11-04 02:17:11 +0100
commit233c6b797ff6c124ba52ae4562bf7e95f86ea301 (patch)
treec262a4298ddcdc1e1f99fba719003fc9894a837b /cmd-line-utils
parent33bb96d9d2bbec5eac3944be4b1e631128733547 (diff)
parentb0701a5c3b3653082d69ee2429ba279adce2f53b (diff)
downloadmariadb-git-233c6b797ff6c124ba52ae4562bf7e95f86ea301.tar.gz
Merge
Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am
index af1bf8b2c97..ae6755f1c5c 100644
--- a/cmd-line-utils/libedit/Makefile.am
+++ b/cmd-line-utils/libedit/Makefile.am
@@ -2,8 +2,8 @@
# Makefile for the GNU readline library.
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
-ASRC=vi.c emacs.c common.c
-AHDR=vi.h emacs.h common.h
+ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
+AHDR = vi.h emacs.h common.h
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(srcdir)/../.. -I..
@@ -42,16 +42,16 @@ SUFFIXES = .sh
$< > $@-t
@MV@ $@-t $@
-vi.h: vi.c makelist
- sh ./makelist -h ./vi.c > $@.tmp && \
+vi.h: $(srcdir)/vi.c makelist
+ sh ./makelist -h $(srcdir)/vi.c > $@.tmp && \
mv $@.tmp $@
-emacs.h: emacs.c makelist
- sh ./makelist -h ./emacs.c > $@.tmp && \
+emacs.h: $(srcdir)/emacs.c makelist
+ sh ./makelist -h $(srcdir)/emacs.c > $@.tmp && \
mv $@.tmp $@
-common.h: common.c makelist
- sh ./makelist -h ./common.c > $@.tmp && \
+common.h: $(srcdir)/common.c makelist
+ sh ./makelist -h $(srcdir)/common.c > $@.tmp && \
mv $@.tmp $@
help.c: ${ASRC} makelist