mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
89 lines
2.1 KiB
Plaintext
89 lines
2.1 KiB
Plaintext
From 8335bec8f6305df689456499d25fc22a5c8cb41c Mon Sep 17 00:00:00 2001
|
|
From: Chris Roberts <cpr420@gmail.com>
|
|
Date: Fri, 27 May 2022 23:44:20 -0600
|
|
Subject: Find the appropriate location for mostrc on Haiku.
|
|
|
|
|
|
diff --git a/src/keyparse.c b/src/keyparse.c
|
|
index 71cd479..91f4e50 100644
|
|
--- a/src/keyparse.c
|
|
+++ b/src/keyparse.c
|
|
@@ -32,6 +32,10 @@
|
|
# endif
|
|
#endif
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <FindDirectory.h>
|
|
+#endif
|
|
+
|
|
/* parses user key definition file */
|
|
|
|
/* The file is assumed to have a simple format:
|
|
@@ -155,6 +159,13 @@ int most_load_user_keymaps (void)
|
|
{
|
|
#ifdef VMS
|
|
file = "SYS$LOGIN:MOST.RC";
|
|
+#elif defined(__HAIKU__)
|
|
+ char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
|
|
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)) != B_OK)
|
|
+ return -1;
|
|
+
|
|
+ strcat(buffer, "/mostrc");
|
|
+ file = strdup(buffer);
|
|
#else
|
|
*filebuf = 0;
|
|
file = getenv ("HOME");
|
|
--
|
|
2.36.1
|
|
|
|
|
|
From 97851c8649bd4ec690c76286a4dd9bd76cdb969a Mon Sep 17 00:00:00 2001
|
|
From: Chris Roberts <cpr420@gmail.com>
|
|
Date: Fri, 27 May 2022 23:45:58 -0600
|
|
Subject: Change install location for docs and man pages
|
|
|
|
|
|
diff --git a/src/Makefile.in b/src/Makefile.in
|
|
index b63a2ee..6529151 100644
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -22,8 +22,8 @@ prefix = @prefix@
|
|
exec_prefix = @exec_prefix@
|
|
datarootdir = @datarootdir@
|
|
BIN_DIR = $(prefix)/bin
|
|
-MAN_DIR = $(datarootdir)/man
|
|
-DOC_DIR = $(datarootdir)/doc/most
|
|
+MAN_DIR = @mandir@
|
|
+DOC_DIR = @docdir@
|
|
SYS_INITFILE = @sysconfdir@/most.conf
|
|
MKINSDIR = ../autoconf/mkinsdir.sh
|
|
|
|
--
|
|
2.36.1
|
|
|
|
|
|
From 5489cfc4bb67ab23498dad4957a722c46ff4e764 Mon Sep 17 00:00:00 2001
|
|
From: Chris Roberts <cpr420@gmail.com>
|
|
Date: Fri, 27 May 2022 23:48:51 -0600
|
|
Subject: add Haiku terminfo dir
|
|
|
|
|
|
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
|
|
index 2b5c447..3d76444 100644
|
|
--- a/autoconf/aclocal.m4
|
|
+++ b/autoconf/aclocal.m4
|
|
@@ -507,6 +507,10 @@ then
|
|
else
|
|
MISC_TERMINFO_DIRS=""
|
|
fi
|
|
+if test "$host_os" = "haiku"
|
|
+then
|
|
+ MISC_TERMINFO_DIRS="/boot/system/data/terminfo"
|
|
+fi
|
|
JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \
|
|
/usr/lib/terminfo \
|
|
/usr/share/terminfo \
|
|
--
|
|
2.36.1
|
|
|