Move non compiled libraries from /lib/rc to /libexec/rc

OpenRC version is now stored as plaintext in /libexec/rc/version

Plugins (cursplash, splashutils) will have to be re-compiled to pickup
the new directories. State data needs to be moved from /lib/rc/init.d
to /libexec/rc/init.d as well.

5 files changed, 14 insertions, 20 deletions

diff --git a/src/rc/Makefile b/src/rc/Makefile
index 378f8e9..b5fc189 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -8,7 +8,7 @@ CLEANFILES=	version.h
 
 BINDIR=		${PREFIX}/bin
 SBINDIR=	${PREFIX}/sbin
-LINKDIR=	${PREFIX}/${LIBNAME}/${PROG}
+LINKDIR=	${LIBEXECDIR}
 
 BINLINKS=	rc-status
 SBINLINKS=	rc-service rc-update runscript start-stop-daemon
@@ -37,21 +37,13 @@ LDADD+=		-lutil -lrc -leinfo
 MK=		../../mk
 include ${MK}/debug.mk
 include ${MK}/prog.mk
+include ${MK}/git.mk
 include ${MK}/cc.mk
 
 include ${MK}/${MKTERMCAP}.mk
 LDADD+=		${LIBDL} ${LIBKVM}
 include ${MK}/${MKPAM}.mk
 
-_GITVER_SH=	if git rev-parse --short HEAD >/dev/null 2>&1; then \
-			printf "."; \
-			git rev-parse --short HEAD; \
-		else \
-			echo ""; \
-		fi
-_GITVER!=	${_GITVER_SH}
-GITVER=		${_GITVER}$(shell ${_GITVER_SH})
-
 ${SRCS}: version.h
 version.h:
 	sed -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index 1cc3dd4..0239f9d 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -50,14 +50,15 @@
 #include "einfo.h"
 #include "rc.h"
 #include "rc-misc.h"
+#include "version.h"
 
 #define PROFILE_ENV     RC_SYSCONFDIR "/profile.env"
-#define SYS_WHITELIST   RC_LIBDIR "/conf.d/env_whitelist"
+#define SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"
 #define USR_WHITELIST   RC_SYSCONFDIR "/conf.d/env_whitelist"
 #define RC_CONF         RC_SYSCONFDIR "/rc.conf"
 #define RC_CONF_OLD     RC_SYSCONFDIR "/conf.d/rc"
 
-#define PATH_PREFIX     RC_LIBDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin"
+#define PATH_PREFIX     RC_LIBEXECDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin"
 
 static RC_STRINGLIST *rc_conf = NULL;
 
@@ -221,7 +222,8 @@ env_config(void)
 		free(e);
 	}
 
-	setenv("RC_LIBDIR", RC_LIBDIR, 1);
+	setenv("RC_VERSION", VERSION, 1);
+	setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 1);
 	setenv("RC_SVCDIR", RC_SVCDIR, 1);
 	setenv("RC_TMPDIR", RC_SVCDIR "/tmp", 1);
 	setenv("RC_BOOTLEVEL", RC_LEVEL_BOOT, 1);
diff --git a/src/rc/rc.c b/src/rc/rc.c
index 8e40e1d..915dc18 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -72,8 +72,8 @@ const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "version.h"
 
-#define INITSH                  RC_LIBDIR "/sh/init.sh"
-#define INITEARLYSH             RC_LIBDIR "/sh/init-early.sh"
+#define INITSH                  RC_LIBEXECDIR "/sh/init.sh"
+#define INITEARLYSH             RC_LIBEXECDIR "/sh/init-early.sh"
 
 #define SHUTDOWN                "/sbin/shutdown"
 #define SULOGIN                 "/sbin/sulogin"
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index c82e55f..44da58c 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -398,10 +398,10 @@ svc_exec(const char *arg1, const char *arg2)
 			    service, strerror(errno));
 			_exit(EXIT_FAILURE);
 		} else {
-			execl(RC_LIBDIR "/sh/runscript.sh",
-			    RC_LIBDIR "/sh/runscript.sh",
+			execl(RC_LIBEXECDIR "/sh/runscript.sh",
+			    RC_LIBEXECDIR "/sh/runscript.sh",
 			    service, arg1, arg2, (char *) NULL);
-			eerror("%s: exec `" RC_LIBDIR "/sh/runscript.sh': %s",
+			eerror("%s: exec `" RC_LIBEXECDIR "/sh/runscript.sh': %s",
 			    service, strerror(errno));
 			_exit(EXIT_FAILURE);
 		}
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index bede39b..58bc23e 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -1188,8 +1188,8 @@ start_stop_daemon(int argc, char **argv)
 					while (*p == ':')
 						p++;
 				}
-				if (strcmp(token, RC_LIBDIR "/bin") != 0 &&
-				    strcmp(token, RC_LIBDIR "/sbin") != 0)
+				if (strcmp(token, RC_LIBEXECDIR "/bin") != 0 &&
+				    strcmp(token, RC_LIBEXECDIR "/sbin") != 0)
 				{
 					len = strlen(token);
 					if (np != newpath)