aboutsummaryrefslogtreecommitdiff
path: root/lib/libedit
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2001-04-12 09:57:12 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2001-04-12 09:57:12 +0000
commit6055a95feec66303517958611c2ac89ff3e8f364 (patch)
tree52edf8581e9a5ca112521a7643f52df1a4193d29 /lib/libedit
parent465ccb3095572e23706f6b59b9d079192453860f (diff)
downloadsrc-6055a95feec66303517958611c2ac89ff3e8f364.tar.gz
src-6055a95feec66303517958611c2ac89ff3e8f364.zip
Back out history.3 link removing - conflict fixed in libreadline instead
Notes
Notes: svn path=/head/; revision=75440
Diffstat (limited to 'lib/libedit')
-rw-r--r--lib/libedit/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 65e61ccab749..331263c9780d 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -19,10 +19,7 @@ MLINKS= editline.3 el_init.3 editline.3 el_end.3 editline.3 el_reset.3 \
editline.3 el_resize.3 editline.3 el_line.3 \
editline.3 el_insertstr.3 editline.3 el_deletestr.3 \
editline.3 history_init.3 editline.3 history_end.3 \
- editline.3 el_data_get.3 editline.3 el_data_set.3
-
-# Conflict with libreadline
-#MLINKS= editline.3 history.3
+ editline.3 history.3 editline.3 el_data_get.3 editline.3 el_data_set.3
# For speed and debugging
#SRCS= ${OSRCS} tokenizer.c history.c