diff options
| author | Roy Marples <roy@marples.name> | 2007-09-19 13:53:40 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-09-19 13:53:40 +0000 |
| commit | 77f9015f0bf09c5ef3c51009e21d8e687006c3e4 (patch) | |
| tree | 5f62c36e8a9e3c3dddeef6a086a0708af35dfcd3 /src | |
| parent | 987c72f12f41b8108447810fe84fd9f16e6d29d7 (diff) | |
| download | openrc-77f9015f0bf09c5ef3c51009e21d8e687006c3e4.tar.xz | |
/lib/rcscripts -> /lib/rc
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/rc-misc.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 93e71d26..4da64061 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,6 +41,7 @@ CFLAGS += -pedantic -std=c99 \ DESTDIR = LIB = lib +RC_LIB = /$(LIB)/rc # Set PAM = pam for pam support PAM = @@ -134,13 +135,13 @@ install: $(TARGET) install -m 0755 -d $(DESTDIR)/sbin install -m 0755 $(SBIN_TARGETS) $(DESTDIR)/sbin ln -sf rc-update $(DESTDIR)/sbin/update-rc - install -m 0755 -d $(DESTDIR)/$(LIB)/rcscripts/conf.d - install -m 0644 $(SYS_WHITELIST) $(DESTDIR)/$(LIB)/rcscripts/conf.d - install -m 0755 -d $(DESTDIR)/$(LIB)/rcscripts/bin + install -m 0755 -d $(DESTDIR)/$(RC_LIB)/conf.d + install -m 0644 $(SYS_WHITELIST) $(DESTDIR)/$(RC_LIB)/conf.d + install -m 0755 -d $(DESTDIR)/$(RC_LIB)/bin for x in $(BINLINKS); do ln -sf ../sbin/rc $(DESTDIR)/bin/$$x; done for x in $(SBINLINKS); do ln -sf rc $(DESTDIR)/sbin/$$x; done - for x in $(RCLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(LIB)/rcscripts/bin/$$x; done - if test "$(PAM)" != "pam" ; then \ + for x in $(RCLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(RC_LIB)/bin/$$x; done + if test "$(PAM)" = "pam" ; then \ install -m 0755 -d $(DESTDIR)/etc/pam.d ; \ install -m 0644 start-stop-daemon.pam $(DESTDIR)/etc/pam.d/start-stop-daemon ; \ fi diff --git a/src/rc-misc.h b/src/rc-misc.h index ec29987e..0df58b5c 100644 --- a/src/rc-misc.h +++ b/src/rc-misc.h @@ -14,7 +14,7 @@ #define RC_LEVEL_BOOT "boot" #define RC_LEVEL_DEFAULT "default" -#define RC_LIBDIR "/" LIB "/rcscripts" +#define RC_LIBDIR "/" LIB "/rc" #define RC_SVCDIR RC_LIBDIR "/init.d" #define RC_DEPTREE RC_SVCDIR "/deptree" #define RC_RUNLEVELDIR "/etc/runlevels" |