Correct r228114 and use the same implementation for tilde.h as for history.h

2 files changed, 33 insertions, 2 deletions

diff --git a/lib/libedit/edit/readline/Makefile b/lib/libedit/edit/readline/Makefile
index 9dc4a5958c10..c36bb686ef9b 100644
--- a/lib/libedit/edit/readline/Makefile
+++ b/lib/libedit/edit/readline/Makefile
@@ -1,8 +1,7 @@
 # Copyright (c) 2011 David E O'Brien
 # $FreeBSD$
 
-INCS=	readline.h history.h
-INCSLINKS=	readline.h ${INCSDIR}/tilde.h
+INCS=	readline.h history.h tilde.h
 
 INCSDIR= ${INCLUDEDIR}/edit/readline
 
diff --git a/lib/libedit/edit/readline/tilde.h b/lib/libedit/edit/readline/tilde.h
new file mode 100644
index 000000000000..1b84338470e7
--- /dev/null
+++ b/lib/libedit/edit/readline/tilde.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2011 David E. O'Brien
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <edit/readline/readline.h>