[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Add --with-snapdir configure option
From: |
Nikola Forró |
Subject: |
[PATCH] Add --with-snapdir configure option |
Date: |
Wed, 26 Feb 2020 13:53:06 +0100 |
User-agent: |
Evolution 3.32.5 (3.32.5-1.fc30) |
Signed-off-by: Nikola Forró <address@hidden>
---
configure.ac | 1 +
m4/man-arg-snapdir.m4 | 17 +++++++++++++++++
src/man_db.conf.in | 2 +-
3 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 m4/man-arg-snapdir.m4
diff --git a/configure.ac b/configure.ac
index 65dbeddd..225bc365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ MAN_ARG_SYSTEMDTMPFILESDIR
MAN_ARG_SYSTEMDSYSTEMUNITDIR
MAN_ARG_MANDIRS
MAN_ARG_MANUAL
+MAN_ARG_SNAPDIR
# Check $PATH for the following programs and append suitable options.
AC_PROG_CC
diff --git a/m4/man-arg-snapdir.m4 b/m4/man-arg-snapdir.m4
new file mode 100644
index 00000000..3cf666aa
--- /dev/null
+++ b/m4/man-arg-snapdir.m4
@@ -0,0 +1,17 @@
+# man-arg-snapdir.m4 serial 1
+dnl MAN_ARG_SNAPDIR
+dnl Add a --with-snapdir option.
+
+AC_DEFUN([MAN_ARG_SNAPDIR],
+[
+AC_ARG_WITH([snapdir],
+[AS_HELP_STRING([--with-snapdir=DIR], [use snap system directory DIR
[DIR=/snap]])],
+ [if test "$withval" = "yes" || test "$withval" = "no"
+ then
+ AC_MSG_ERROR([--with-snapdir requires an argument])
+ else
+ snapdir="$withval"
+ fi],
+ [: ${snapdir=/snap}])
+AC_SUBST([snapdir])
+])
diff --git a/src/man_db.conf.in b/src/man_db.conf.in
index 2942000f..042fc599 100644
--- a/src/man_db.conf.in
+++ b/src/man_db.conf.in
@@ -69,7 +69,7 @@ MANDB_MAP /usr/local/man /var/cache/man/oldlocal
MANDB_MAP /usr/local/share/man /var/cache/man/local
MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6
MANDB_MAP /opt/man /var/cache/man/opt
-MANDB_MAP /snap/man /var/cache/man/snap
+MANDB_MAP @snapdir@/man /var/cache/man/snap
#
#---------------------------------------------------------
# Program definitions. These are commented out by default as the value
--
2.21.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Add --with-snapdir configure option,
Nikola Forró <=