From f2c1f19d860b248133ea6d5a7dbe84eb594b24ec Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Sun, 6 Aug 2023 22:33:32 +0300
Subject: [PATCH 1/3] Makefie.in: fix install location

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 72cd25962..93678b981 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ mandir = @mandir@
 
 LIBS = @LIBS@
 
-gerbil_home = ${prefix}/lib/${PACKAGE_SHORTNAME}
+gerbil_home = ${prefix}
 gerbil_bin = "$(gerbil_home)/bin"
 gerbil_lib = "${gerbil_home}/lib"
 gerbil_share = "${gerbil_home}/share"

From 24edfe889870cddc2c09419c1b9d724fa79bc090 Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Sun, 6 Aug 2023 22:37:59 +0300
Subject: [PATCH 2/3] enable zlib must be enabled by default or else the build
 fails

---
 configure    | 4 ++--
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 5df0d4ede..70d87daa3 100755
--- a/configure
+++ b/configure
@@ -1831,7 +1831,7 @@ if test ${enable_zlib+y}
 then :
   enableval=$enable_zlib; ENABLE_ZLIB=$enableval
 else $as_nop
-  ENABLE_ZLIB=no
+  ENABLE_ZLIB=yes
 fi
 
 
@@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
-  FS = "$(printf '\a')"
+  FS = ""
 
 }
 {
diff --git a/configure.ac b/configure.ac
index 982d89350..1ea1c66a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ fi
 AC_ARG_ENABLE(zlib,
 AS_HELP_STRING([--disable-zlib], [build std/text/zlib libraries - requires zlib (default is --enable-zlib]),
 ENABLE_ZLIB=$enableval,
-ENABLE_ZLIB=no)
+ENABLE_ZLIB=yes)
 
 if test "$ENABLE_ZLIB" = yes; then
 gerbil_make_conf="$gerbil_make_conf --enable-zlib"

From 3fab295d7d7a09feeb12d3b65e6268bbf8be1635 Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Mon, 7 Aug 2023 00:11:25 +0300
Subject: [PATCH 3/3] Makefile.in: remove the linkdir madness

---
 Makefile.in | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 93678b981..04a0cb87b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,10 +41,6 @@ gerbil_bin = "$(gerbil_home)/bin"
 gerbil_lib = "${gerbil_home}/lib"
 gerbil_share = "${gerbil_home}/share"
 
-
-gerbil_bin_linkdir = "${prefix}/bin"
-gerbil_share_linkdir = "${prefix}/share"
-
 gerbil_make_conf = @gerbil_make_conf@
 
 gerbil: configure
@@ -63,7 +59,6 @@ stdlib:
 lang:
 	cd src && LDFLAGS="$(LIBS)" ./build.sh lang
 
-
 r7rs-large:
 	cd src && LDFLAGS="$(LIBS)" ./build.sh r7rs-large
 
@@ -77,15 +72,11 @@ stage1:
 	cd src && LDFLAGS="$(LIBS)" ./build.sh stage1
 
 layout:
-		cd src && LDFLAGS="$(LIBS)" ./build.sh layout
+	cd src && LDFLAGS="$(LIBS)" ./build.sh layout
 
 tags:
 	cd src && LDFLAGS="$(LIBS)" ./build.sh tags
 
 install:
-	mkdir -p ${gerbil_bin} ${gerbil_share} ${gerbil_bin_linkdir} ${gerbil_share_linkdir}
+	mkdir -p ${gerbil_bin} ${gerbil_lib} ${gerbil_share}
 	cd src && ./install
-	cp -a --link --remove-destination ${gerbil_bin}/* ${gerbil_bin_linkdir}  || \
-	cp -a ${gerbil_bin}/* ${gerbil_bin_linkdir}
-	cp -a --link --remove-destination ${gerbil_share}/* ${gerbil_share_linkdir}  || \
-	cp -a ${gerbil_share}/* ${gerbil_share_linkdir}