aboutsummaryrefslogtreecommitdiffstats
path: root/include/paths.h
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2020-10-23 09:22:23 +0000
committerStefan Eßer <se@FreeBSD.org>2020-10-23 09:22:23 +0000
commit34b38e1245edc730c4a5707cac2121780031770b (patch)
tree3eb5443a11bb332a8eb5c605f74e08f910158cbd /include/paths.h
parenta71074e0af2b37a3f9082bafb8a0a0feb3cd4515 (diff)
downloadsrc-34b38e1245edc730c4a5707cac2121780031770b.tar.gz
src-34b38e1245edc730c4a5707cac2121780031770b.zip
Add search of LOCALBASE/share/calendar for calendars supplied by a port.
Calendar files in LOCALBASE override similarily named ones in the base system. This could easily be changed if the base system calendars should have precedence, but it could lead to a violation of POLA since then the port's files were ignored unless those in base have been deleted. There was no definition of _PATH_LOCALBASE in paths.h, but verbatim uses of /usr/local existed for _PATH_DEFPATH. Use _PATH_LOCALBASE here to ease a consistent modification of this prefix. Reviewed by: imp, pfg Differential Revision: https://reviews.freebsd.org/D26882
Notes
Notes: svn path=/head/; revision=366962
Diffstat (limited to 'include/paths.h')
-rw-r--r--include/paths.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/paths.h b/include/paths.h
index f8df80518c5c..9af602635552 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -37,8 +37,11 @@
#include <sys/cdefs.h>
+#define _PATH_LOCALBASE "/usr/local"
+
/* Default search path. */
-#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
+#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:" \
+ _PATH_LOCALBASE "/sbin:" _PATH_LOCALBASE "/bin"
/* All standard utilities path. */
#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
/* Locate system binaries. */