From e2cd7248d80f9ae57b8f010e3bd5297da2a124c5 Mon Sep 17 00:00:00 2001
From: Ole Streicher <olebole@debian.org>
Date: Fri, 23 Feb 2024 17:34:42 +0100
Subject: [PATCH 1/2] Use libedit on all platforms

---
 pkg/ecl/mkpkg | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkg/ecl/mkpkg b/pkg/ecl/mkpkg
index 4b2182a81..70081d0a0 100644
--- a/pkg/ecl/mkpkg
+++ b/pkg/ecl/mkpkg
@@ -39,13 +39,8 @@ relink:
 		<libc/iraf_stdio.h> config.h construct.h errs.h\
 		grammar.h mem.h opcodes.h operand.h param.h task.h
 link:
-	$set	LIBS = "-lc -lcur -lds -lstg"
-	$ifeq (MACH, macosx, macintel, macos64) then
-	  $set	LIBS2 = "-ledit"
-	$else
-	  $set	LIBS2 = "-lreadline"
-	$endif
-	$link	ecl.o globals.o opcodes.o libpkg.a $(LIBS) $(LIBS2)
+	$set	LIBS = "-lc -lcur -lds -lstg -ledit"
+	$link	ecl.o globals.o opcodes.o libpkg.a $(LIBS)
 	;
 
 install:

From 6d7cac971879e3c9e3cea95192b7d39244943d99 Mon Sep 17 00:00:00 2001
From: Ole Streicher <olebole@debian.org>
Date: Fri, 23 Feb 2024 17:38:55 +0100
Subject: [PATCH 2/2] Document using libedit instead of libreadline on Linux

---
 .github/workflows/citest.yml | 4 ++--
 INSTALL.md                   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/citest.yml b/.github/workflows/citest.yml
index 36a650e41..c392c2231 100644
--- a/.github/workflows/citest.yml
+++ b/.github/workflows/citest.yml
@@ -42,10 +42,10 @@ jobs:
           if [ ${LDFLAGS} == '-m32' ] ; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
-            sudo apt-get install -y gcc-multilib libcurl4-openssl-dev:i386 libexpat1-dev:i386 libreadline-dev:i386 zlib1g-dev:i386
+            sudo apt-get install -y gcc-multilib libcurl4-openssl-dev:i386 libexpat1-dev:i386 libedit-dev:i386 zlib1g-dev:i386
           else
             sudo apt-get update -y
-            sudo apt-get install -y build-essential libcurl4-openssl-dev libexpat1-dev libreadline-dev zlib1g-dev
+            sudo apt-get install -y build-essential libcurl4-openssl-dev libexpat1-dev libedit-dev zlib1g-dev
           fi
 
       - name: Build IRAF
diff --git a/INSTALL.md b/INSTALL.md
index 31da87ab2..e4d0e542a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,16 +2,15 @@
 
 ## System Requirements and Dependencies
 
-The distributed binaries require the readline or libedit, and zlib
-libraries to be installed.
+The distributed binaries require the libedit and zlib libraries to be installed.
 
 On Debian and its derivatives (Ubuntu, Mint, Devuan, Raspbian etc.):
 
-	$ sudo apt install gcc make bison flex zlib1g-dev libreadline-dev
+	$ sudo apt install gcc make bison flex zlib1g-dev libedit-dev
 
 On Fedora and its derivatives (Redhat, Scientific Linux etc.)
 
-	$ sudo dnf install gcc make perl flex bison zlib-devel readline-devel
+	$ sudo dnf install gcc make perl flex bison zlib-devel libedit-devel
 
 On macOS, you need to have the XCode tools installed. If you
 haven't, you can install them with: