librc, meson: remove PKG_PREFIX

the same as the local prefix on seemingly all systems, of which was
defined incorrectly as $prefix/usr/local. since most systems call it
local prefix, drop the 'pkg' one

Author: navi-desu

README.md

@@ -13,11 +13,6 @@ usual methods for this build system to build and install.
 
 We don't support building a static OpenRC with PAM.
 
-`PKG_PREFIX` should be set to where packages install to by default.
-
-`LOCAL_PREFIX` should be set to where user maintained packages are.
-Only set `LOCAL_PREFIX` if different from `PKG_PREFIX`.
-
 `rc` and `rc.shutdown` are the hooks from the BSD init into OpenRC.
 
 `devd.conf` is modified from FreeBSD to call `/etc/rc.devd` which is a

init.d/rc-enabled.in

@@ -21,8 +21,8 @@ start()
 {
 	ebegin "Starting local rc services"
 	local svc= enabled= retval=0 service= pkgdir=
-	[ -n "@PKG_PREFIX@" ] && pkgdir="@PKG_PREFIX@/etc/rc.d/*"
-	for svc in $(rcorder /etc/rc.d/* $pkgdir 2>/dev/null); do
+	[ -n "@LOCAL_PREFIX@" ] && localdir="@LOCAL_PREFIX@/etc/rc.d/*"
+	for svc in $(rcorder /etc/rc.d/* $localdir 2>/dev/null); do
 		[ -x "$svc" ] || continue
 		service=${svc##*/}
 

meson.build

@@ -29,7 +29,11 @@ libname = get_option('libdir').split('/')[-1]
 
 local_prefix = get_option('local_prefix')
 if local_prefix == ''
-  local_prefix = get_option('prefix') / 'usr' / 'local'
+  if os == 'netbsd'
+    local_prefix = '/usr/pkg'
+  else
+    local_prefix = '/usr/local'
+  endif
 endif
 
 os = host_machine.system()
@@ -52,17 +56,6 @@ if get_option('pam')
   c_flags += '-DHAVE_PAM'
 endif
 
-pkg_prefix = get_option('pkg_prefix')
-if pkg_prefix == ''
-  if os == 'dragonfly' or os == 'freebsd'
-    pkg_prefix = '/usr/local'
-  elif os == 'gnu' or os == 'linux'
-    pkg_prefix = '/usr'
-  elif os == 'netbsd'
-    pkg_prefix = '/usr/pkg'
-  endif
-endif
-
 bindir = get_option('prefix') / get_option('bindir')
 libdir = get_option('prefix') / get_option('libdir')
 pluginsdir = libdir / 'rc/plugins'
@@ -166,7 +159,7 @@ rc_incdir = include_directories('src/librc')
 
 init_d_conf_data = configuration_data()
 init_d_conf_data.set('SBINDIR', sbindir)
-init_d_conf_data.set('PKG_PREFIX', pkg_prefix)
+init_d_conf_data.set('LOCAL_PREFIX', local_prefix)
 init_d_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
 init_d_conf_data.set('RC_LIBEXECDIR', rc_libexecdir)
 

meson_options.txt

@@ -12,8 +12,6 @@ option('pam', type : 'boolean',
   description : 'enable PAM support')
 option('pam_libdir', type : 'string',
   description : 'directory to install pam security modules')
-option('pkg_prefix', type : 'string',
-  description : 'default location where packages are installed')
 option('pkgconfig', type : 'boolean',
   description : 'build PKGConfig files')
 option('selinux', type : 'feature', value : 'auto',

sh/functions.sh.in

@@ -61,12 +61,11 @@ _sanitize_path()
 		case "$p" in
 			@LIBEXECDIR@/bin|@LIBEXECDIR@/sbin);;
 			@BINDIR@|@SBINDIR@|/usr/bin|/usr/sbin);;
-			@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
 			@LOCAL_PREFIX@/bin|@LOCAL_PREFIX@/sbin);;
 			*) path="$path${path:+:}$p";;
 		esac
 	done
-	echo "$path"
+	[ "$path" ] && echo ":$path"
 }
 
 # Allow our scripts to support zsh
@@ -78,20 +77,8 @@ if [ -n "$ZSH_VERSION" ]; then
 fi
 
 # Make a sane PATH
-_PKG_PREFIX=@PKG_PREFIX@
-_LOCAL_PREFIX=@LOCAL_PREFIX@
-_LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local}
-_PATH="@LIBEXECDIR@/bin:/bin:/sbin:/usr/bin:/usr/sbin"
-
-if [ -n "$_PKG_PREFIX" ]; then
-	_PATH="$_PATH:$_PKG_PREFIX/bin:$_PKG_PREFIX/sbin"
-fi
-if [ -n "$_LOCAL_PREFIX" ]; then
-	_PATH="$_PATH:$_LOCAL_PREFIX/bin:$_LOCAL_PREFIX/sbin"
-fi
-_path="$(_sanitize_path "$PATH")"
-PATH="$_PATH${_path:+:}$_path" ; export PATH
-unset _sanitize_path _PREFIX _PKG_PREFIX _LOCAL_PREFIX _PATH _path
+export PATH="@LIBEXECDIR@/bin:/bin:/sbin:/usr/bin:/usr/sbin:@LOCAL_PREFIX@/bin:@LOCAL_PREFIX@/sbin$(_sanitize_path)"
+unset _sanitize_path
 
 for arg; do
 	case "$arg" in

sh/meson.build

@@ -2,7 +2,6 @@ sh_conf_data = configuration_data()
 sh_conf_data.set('BINDIR', bindir)
 sh_conf_data.set('LIBEXECDIR', rc_libexecdir)
 sh_conf_data.set('LOCAL_PREFIX', local_prefix)
-sh_conf_data.set('PKG_PREFIX', pkg_prefix)
 sh_conf_data.set('SBINDIR', sbindir)
 sh_conf_data.set('SHELL', get_option('shell'))
 sh_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))

src/librc/meson.build

@@ -2,7 +2,6 @@ rc_h_conf_data = configuration_data()
 rc_h_conf_data.set('RC_LIBEXECDIR', rc_libexecdir)
 rc_h_conf_data.set('RC_PLUGINDIR', pluginsdir)
 rc_h_conf_data.set('LOCAL_PREFIX', local_prefix)
-rc_h_conf_data.set('PKG_PREFIX', pkg_prefix)
 rc_h_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
 
 librc_sources = [

src/librc/rc.h.in

@@ -47,23 +47,21 @@ extern "C" {
 
 #define RC_PATH_PREFIX     RC_LIBEXECDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin"
 
-/* PKG_PREFIX is where packages are installed if different from the base OS
- * On Gentoo this is normally unset, on FreeBSD /usr/local and on NetBSD
- * /usr/pkg. */
-#define RC_PKG_PREFIX		"@PKG_PREFIX@"
-#ifdef RC_PKG_PREFIX
-#  define RC_PKG_INITDIR        RC_PKG_PREFIX "/etc/init.d"
-#  define RC_PKG_CONFDIR        RC_PKG_PREFIX "/etc/conf.d"
-#endif
-
-/* LOCAL_PREFIX is for user written stuff, which the base OS and package
- * manager don't touch. */
+/* LOCAL_PREFIX is used for packages not part of the base system */
 #define RC_LOCAL_PREFIX		"@LOCAL_PREFIX@"
 #ifdef RC_LOCAL_PREFIX
 #  define RC_LOCAL_INITDIR      RC_LOCAL_PREFIX "/etc/init.d"
 #  define RC_LOCAL_CONFDIR      RC_LOCAL_PREFIX "/etc/conf.d"
 #endif
 
+/* Compat macros */
+#define RC_PKG_PREFIX		RC_LOCAL_PREFIX
+#ifdef RC_PKG_PREFIX
+#  define RC_PKG_INITDIR        RC_PKG_PREFIX "/etc/init.d"
+#  define RC_PKG_CONFDIR        RC_PKG_PREFIX "/etc/conf.d"
+#endif
+
+
 #ifndef rc_private
 #define rc_private __attribute__((deprecated("private field")))
 #endif