shithub: mc

Download patch

ref: a229550437b42fcddd9b79bf059a28130b2e74b1
parent: 545d75324d8ad1d9f8f9977b0911e8e9e0704674
author: James Turner <james@calminferno.net>
date: Tue Feb 7 13:49:52 EST 2017 

Remove the need for local OpenBSD patches.

OpenBSD uses /usr/local/man not /usr/local/share/man. Create a new
INST_MAN variable that can be used to control the man path and move
Manpath into the OS specific settings.


--- a/configure
+++ b/configure
@@ -1,13 +1,5 @@
 #!/bin/sh
 
-for i in `seq 30`; do
-    echo "Lots of output to emulate automake... ok"
-    echo "Testing for things you'll never use... fail"
-    echo "Satisfying the fortran77 lobby... ok"
-    echo "Burning CPU time checking for the bloody obvious... ok"
-done
-echo "Automake emulated successfully"
-
 prefix="/usr/local"
 
 for arg in $*; do
@@ -18,13 +10,13 @@
                 . ./configvar_cache
             fi
             ;;
-        "--prefix" | "-p") 
+        "--prefix" | "-p")
             prefix=shift $*
             ;;
         --prefix=*)
             prefix=`echo $arg | sed 's/^--prefix=//g'`
             ;;
-        "--help" | "-h") 
+        "--help" | "-h")
             echo "Usage:"
             echo "      --prefix | -p: The prefix to install to"
             break;
@@ -52,8 +44,10 @@
 case $OS in
     *Linux*)
         echo 'export SYS=linux' >> config.mk
+        echo export INST_MAN=$prefix/share/man/man >> config.mk
         echo 'const Sys = "Linux"' >> mbld/config.myr
         echo 'const Linkcmd = ["ld", "-o"]' >> mbld/config.myr
+        echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
         ;;
     *Darwin*)
 	symprefix='"_"'
@@ -60,22 +54,28 @@
 	defaultasm=Gnugasmacho
 	sysinit='setenv("MACOSX_DEPLOYMENT_TARGET", "10.6", 0)'
         echo 'export SYS=osx' >> config.mk
+        echo export INST_MAN=$prefix/share/man/man >> config.mk
         echo 'const Sys = "OSX"' >> mbld/config.myr
         echo 'const Linkcmd = ["ld", ' \
             '"-pagezero_size", "0x100000000",' \
             '"-macosx_version_min", "10.6",'\
             '"-o"]' >> mbld/config.myr
+        echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
 	env='[("MACOSX_DEPLOYMENT_TARGET", "10.6")][:]'
         ;;
     *FreeBSD*)
         echo 'export SYS=freebsd' >> config.mk
+        echo export INST_MAN=$prefix/share/man/man >> config.mk
         echo 'const Sys = "FreeBSD"' >> mbld/config.myr
         echo 'const Linkcmd = ["ld", "-o"]' >> mbld/config.myr
+        echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
         ;;
     *OpenBSD*)
         echo 'export SYS=openbsd' >> config.mk
+        echo export INST_MAN=$prefix/man/man >> config.mk
         echo 'const Sys = "OpenBSD"' >> mbld/config.myr
         echo 'const Linkcmd = ["ld", "-static", "-nopie", "-o"]' >> mbld/config.myr
+        echo "const Manpath = \"man/man\"" >> mbld/config.myr
         ;;
     *)
         echo ''
@@ -106,7 +106,6 @@
 echo "const Runtime = \"_myrrt.o\"" >> mbld/config.myr
 
 # paths to install to
-echo "const Manpath = \"share/man/man\"" >> mbld/config.myr
 echo "const Sharepath = \"share\"" >> mbld/config.myr
 echo "const Binpath = \"bin\"" >> mbld/config.myr
 echo "const Libpath = \"lib/myr\"" >> mbld/config.myr
--- a/mk/c.mk
+++ b/mk/c.mk
@@ -81,9 +81,9 @@
 	    done
 	@for i in $(INSTMAN); do \
 		sect="$${i##*.}"; \
-		echo install -m 644 $$i $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${sect}); \
-		mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${sect}); \
-		install -m 644 $$i $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${sect}); \
+		echo install -m 644 $$i $(abspath $(DESTDIR)/$(INST_MAN)$${sect}); \
+		mkdir -p $(abspath $(DESTDIR)/$(INST_MAN)$${sect}); \
+		install -m 644 $$i $(abspath $(DESTDIR)/$(INST_MAN)$${sect}); \
 	done
 
 subdirs-uninstall:
@@ -112,8 +112,8 @@
 	done
 	@for i in $(INSTMAN); do \
 		sect="$${i##*.}" \
-		echo rm -f $$i $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${sect}/$$i); \
-		rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${sect}/$$i); \
+		echo rm -f $$i $(abspath $(DESTDIR)/$(INST_MAN)$${sect}/$$i); \
+		rm -f $(abspath $(DESTDIR)/$(INST_MAN)$${sect}/$$i); \
 	done
 
 %.o: %.c $(GENHDR) .deps/stamp