aboutsummaryrefslogtreecommitdiffstats
path: root/mandriva
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-08-30 12:42:16 +0100
committerColin Guthrie <colin@mageia.org>2014-08-30 12:42:16 +0100
commit831eca5a4759006d14cb431d111953e468b4c729 (patch)
tree566b706aab9be0ffdfdb138ac4e1c0c076a07382 /mandriva
parentea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be (diff)
downloadinitscripts-831eca5a4759006d14cb431d111953e468b4c729.tar
initscripts-831eca5a4759006d14cb431d111953e468b4c729.tar.gz
initscripts-831eca5a4759006d14cb431d111953e468b4c729.tar.bz2
initscripts-831eca5a4759006d14cb431d111953e468b4c729.tar.xz
initscripts-831eca5a4759006d14cb431d111953e468b4c729.zip
Move remain bits to /usr
The previous merge pulled in this for all the upstream stuff, so we should follow suit
Diffstat (limited to 'mandriva')
-rw-r--r--mandriva/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/mandriva/Makefile b/mandriva/Makefile
index f9c952a9..b975a4bd 100644
--- a/mandriva/Makefile
+++ b/mandriva/Makefile
@@ -31,10 +31,10 @@ clean:
install: all check
mkdir -p $(ROOT)/usr/{bin/,sbin/,man/man8}
- mkdir -p $(ROOT)/sbin
+ mkdir -p $(ROOT)/usr/sbin
mkdir -p $(ROOT)/etc/modprobe.preload.d/
mkdir -p $(ROOT)/etc/rc.d/init.d/
- mkdir -p $(ROOT)/lib/lsb
+ mkdir -p $(ROOT)/usr/lib/lsb
mkdir -p $(ROOT)/etc/profile.d/
mkdir -p $(ROOT)/etc/ppp/ip-{up,down}.d/
mkdir -p $(ROOT)/etc/sysconfig/network-scripts/if{up,down}.d
@@ -58,8 +58,8 @@ install: all check
@for i in $(SUBDIRS);do make -C $$i install;done
install -m755 dm $(ROOT)/etc/rc.d/init.d/
- install -m755 hibernate-cleanup.sh $(ROOT)/sbin/
- install -m755 lsb-init-functions $(ROOT)/lib/lsb/init-functions
+ install -m755 hibernate-cleanup.sh $(ROOT)/usr/sbin/
+ install -m755 lsb-init-functions $(ROOT)/usr/lib/lsb/init-functions
install -m755 mdv-network-event $(ROOT)/usr/sbin/
ifneq ($(shell if echo $(ARCH)|grep -q 'sparc';then echo sparc;fi),sparc)
install -m755 supermount $(ROOT)/usr/sbin/