aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile74
1 files changed, 37 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index 08616315..576992ed 100644
--- a/Makefile
+++ b/Makefile
@@ -13,29 +13,32 @@ all:
make -C po
install:
- mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin
+ mkdir -p $(ROOT)/etc/profile.d $(ROOT)/usr/sbin
mkdir -p $(ROOT)$(mandir)/man{5,8}
mkdir -p $(ROOT)/etc/rwtab.d $(ROOT)/etc/statetab.d
mkdir -p $(ROOT)/var/lib/stateless/writable
mkdir -p $(ROOT)/var/lib/stateless/state
install -m644 adjtime $(ROOT)/etc
- install -m644 inittab $(ROOT)/etc
+ install -m644 inittab $(ROOT)/etc
install -m644 rwtab statetab networks $(ROOT)/etc
- install -m755 service $(ROOT)/sbin
- install -m644 lang.csh $(ROOT)/etc/profile.d/10lang.csh
- install -m644 lang.sh $(ROOT)/etc/profile.d/10lang.sh
- install -m644 term256.csh $(ROOT)/etc/profile.d/10term256.csh
- install -m644 term256.sh $(ROOT)/etc/profile.d/10term256.sh
+ install -m755 service $(ROOT)/usr/sbin
+ install -m644 lang.csh $(ROOT)/etc/profile.d/10-lang.csh
+ install -m644 lang.sh $(ROOT)/etc/profile.d/10-lang.sh
+ install -m644 256term.csh $(ROOT)/etc/profile.d/10-256term.csh
+ install -m644 256term.sh $(ROOT)/etc/profile.d/10-256term.sh
install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d
install -m755 sys-unconfig $(ROOT)/usr/sbin
install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
mkdir -p -m 755 $(ROOT)/usr/lib/sysctl.d
+ mkdir -p -m 755 $(ROOT)/etc/sysctl.d
install -m644 sysctl.conf $(ROOT)/usr/lib/sysctl.d/00-system.conf
if uname -m | grep -q sparc ; then \
install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
if uname -m | grep -q s390 ; then \
install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
+ install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf
+ ln -s ../sysctl.conf $(ROOT)/etc/sysctl.d/99-sysctl.conf
mkdir -p $(ROOT)/etc/X11
install -m755 prefdm $(ROOT)/etc/X11/prefdm
@@ -50,12 +53,12 @@ install:
# (cg) Are the two lines below needed these days???
mkdir -p $(ROOT)/etc/sysconfig/console/consolefonts
mkdir -p $(ROOT)/etc/sysconfig/console/consoletrans
- mkdir -p $(ROOT)/lib/systemd/
- cp -af systemd/* $(ROOT)/lib/systemd/
- chmod 755 $(ROOT)/lib/systemd/mandriva-*
+ mkdir -p $(ROOT)/usr/lib/systemd/
+ cp -af systemd/* $(ROOT)/usr/lib/systemd/
+ chmod 755 $(ROOT)/usr/lib/systemd/mandriva-*
mkdir -p $(ROOT)/etc/ppp/peers
- mkdir -p $(ROOT)/lib
- cp -af udev $(ROOT)/lib
+ mkdir -p $(ROOT)/usr/lib
+ cp -af udev $(ROOT)/usr/lib
chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
chmod 644 $(ROOT)/etc/rc.d/init.d/functions
chmod 755 $(ROOT)/etc/ppp/peers
@@ -70,11 +73,11 @@ install:
install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
fi
- mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
- mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin
+ mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin
+ mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin
(cd $(ROOT)/etc/sysconfig/network-scripts; \
- ln -sf ../../../sbin/ifup . ; \
- ln -sf ../../../sbin/ifdown . )
+ ln -sf ../../../usr/sbin/ifup . ; \
+ ln -sf ../../../usr/sbin/ifdown . )
make install ROOT=$(ROOT) mandir=$(mandir) -C src
make install PREFIX=$(ROOT) -C po
@@ -99,27 +102,24 @@ install:
done
# Can't store symlinks in a CVS archive
- mkdir -p -m 755 $(ROOT)/lib/systemd/system/multi-user.target.wants
- mkdir -p -m 755 $(ROOT)/lib/systemd/system/graphical.target.wants
- ln -s reboot.target $(ROOT)/lib/systemd/system/ctrl-alt-del.target
- mkdir -p -m 755 $(ROOT)/lib/systemd/system/local-fs.target.wants
- mkdir -p -m 755 $(ROOT)/lib/systemd/system/basic.target.wants
- mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants
- ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants
- ln -s ../fedora-import-state.service $(ROOT)/lib/systemd/system/local-fs.target.wants
- ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants
- ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants
- ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants
- ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants
-
- mkdir -p $(ROOT)/lib/tmpfiles.d
- install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf
- install -m 644 mandriva.tmpfiles.d $(ROOT)/lib/tmpfiles.d/mandriva.conf
+ mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants
+ mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/graphical.target.wants
+ mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+ mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
+ ln -s ../fedora-configure.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../fedora-loadmodules.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../fedora-autorelabel.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+ ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+ ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
+ ln -s ../mandriva-save-dmesg.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../mandriva-everytime.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+
+ mkdir -p $(ROOT)/usr/lib/tmpfiles.d
+ install -m 644 initscripts.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/initscripts.conf
+ install -m 644 mandriva.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/mandriva.conf
# These are LSB compatibility symlinks. At some point in the future
# the actual files will be here instead of symlinks