From c3ab769f8dc16373cabac8c4b89dd3fcc44d4257 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Wed, 9 Dec 2020 10:15:15 -0500
Subject: [PATCH] Fix build system issues

Also, move the gophernicus man page to its appropriate section (8)
---
 Makefile.in                    | 16 +++++++---------
 configure                      | 10 +++++-----
 gophernicus.1 => gophernicus.8 |  0
 3 files changed, 12 insertions(+), 14 deletions(-)
 rename gophernicus.1 => gophernicus.8 (100%)

diff --git a/Makefile.in b/Makefile.in
index 24ddacc..00b807b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,14 +8,15 @@ SOURCES = src/$(NAME).c src/file.c src/menu.c src/string.c src/platform.c src/se
 HEADERS = src/files.h src/filetypes.h
 OBJECTS = $(SOURCES:.c=.o)
 README  = README.md
-MANPAGE = $(DESTDIR)gophernicus.1
+MANPAGE = gophernicus.8
+MAP     = gophermap
 
 DESTDIR ?= /
 PREFIX   = @PREFIX@
 BINDIR   = @BINDIR@
 SBINDIR  = @SBINDIR@
 MANDIR   = @MANDIR@
-MAN1DIR  = @MAN1DIR@
+MAN8DIR  = @MAN8DIR@
 
 INSTALL      = @INSTALL@
 INSTALL_ARGS = -o 0 -g 0
@@ -76,11 +77,8 @@ clean-shm:
 
 # Install cases
 
-install: src/$(BINARY) @CLEAN_SHM@ install-man @INSTALL_ROOT@ @INSTALL_OSX@ @INSTALL_HAIKU@ @INSTALL_SYSTEMD@ @INSTALL_XINETD@ @INSTALL_INETD_MANUAL@ @INSTALL_INETD_UPDATE@ install-done
-	$(INSTALL) -s -m 755 src/$(BINARY) $(DESTDIR)$(SBINDIR)
-.PHONY: install
-
-install-done:
+install: src/$(BINARY) @CLEAN_SHM@ install-man @INSTALL_ROOT@ @INSTALL_OSX@ @INSTALL_HAIKU@ @INSTALL_SYSTEMD@ @INSTALL_XINETD@ @INSTALL_INETD_MANUAL@ @INSTALL_INETD_UPDATE@
+	$(INSTALL) -s -m 755 -D -t $(DESTDIR)$(SBINDIR) src/$(BINARY)
 	@echo
 	@echo "======================================================================"
 	@echo
@@ -94,10 +92,10 @@ install-done:
 	@echo
 
 install-man:
-	$(INSTALL) -m 644 $(MANPAGE) $(DESTDIR)$(MANDEST)
+	$(INSTALL) -m 644 -D -t $(DESTDIR)$(MAN8DIR) $(MANPAGE)
 
 install-root:
-	$(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)
+	$(INSTALL) -m 644 -D $(MAP).sample $(DESTDIR)$(ROOT)/gophermap
 
 install-inetd-update: install-root
 	update-inetd --add $$(sed -e "s/@BINARY_PATH@/$(DESTDIR)$(SBINDIR)$(BINARY)/g" -e "s/@BINARY_NAME@/$(BINARY)/g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)
diff --git a/configure b/configure
index 579a5db..03a55ba 100755
--- a/configure
+++ b/configure
@@ -8,7 +8,7 @@ usage() {
     printf "  --bindir=PREFIX/bin         Prefix for binaries\\n"
     printf "  --sbindir=PREFIX/sbin       Prefix for system binaries\\n"
     printf "  --mandir=PREFIX/share/man   Prefix for manpages\\n"
-    printf "  --man1dir=MANDIR/man1       Prefix for section 1 manpages\\n"
+    printf "  --man8dir=MANDIR/man8       Prefix for section 8 manpages\\n"
     printf "  --gopherroot=/var/gopher    Path to gopher root\\n"
     printf "  --sysconfig=/etc/sysconfig  Path to sysconfig directory\\n\\n"
     printf "  --default=/etc/default      Path to 'default' configuration directory\\n\\n"
@@ -30,7 +30,7 @@ while [ "$#" -gt 0 ] ; do
         sbindir) SBINDIR="${value}"; shift ;;
         docdir) DOCDIR="${value}"; shift ;;
         mandir) MANDIR="${value}"; shift ;;
-        man1dir) MAN1DIR="${value}"; shift ;;
+        man8dir) MAN8DIR="${value}"; shift ;;
         gopherroot) GOPHERROOT="${value}"; shift ;;
         sysconfig) SYSCONFIG="${value}"; shift ;;
         default) DEFAULTCONF="${value}"; shift ;;
@@ -50,7 +50,7 @@ done
 : ${SBINDIR:=${PREFIX}/sbin}
 : ${DOCDIR:=${PREFIX}/share/doc}
 : ${MANDIR:=${PREFIX}/share/man}
-: ${MAN1DIR:=${MANDIR}/man1}
+: ${MAN8DIR:=${MANDIR}/man8}
 : ${GOPHERROOT:=/var/gopher}
 : ${SYSCONFIG:=/etc/sysconfig}
 : ${DEFAULTCONF:=/etc/default}
@@ -223,7 +223,7 @@ cat > conftest.c <<EOF
 int main() {}
 EOF
 if ${CC} -o conftest -lwrap conftest.c 2>/dev/null; then
-    LIBWRAP="-DHAVE_LIBWRAP"
+    LIBWRAP="-DHAVE_LIBWRAP -lwrap"
     printf "yes"
 else
     LIBWRAP=
@@ -275,7 +275,7 @@ sed -i "s:@BINDIR@:${BINDIR}:" Makefile
 sed -i "s:@SBINDIR@:${SBINDIR}:" Makefile
 sed -i "s:@DOCDIR@:${DOCDIR}:" Makefile
 sed -i "s:@MANDIR@:${MANDIR}:" Makefile
-sed -i "s:@MAN1DIR@:${MAN1DIR}:" Makefile
+sed -i "s:@MAN8DIR@:${MAN8DIR}:" Makefile
 
 sed -i "s:@IPCRM@:${IPCRM}:" Makefile
 sed -i "s:@CLEAN_SHM@:${CLEAN_SHM}:" Makefile
diff --git a/gophernicus.1 b/gophernicus.8
similarity index 100%
rename from gophernicus.1
rename to gophernicus.8