aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2007-11-14 21:38:35 +0000
committerBill Nottingham <notting@redhat.com>2007-11-14 21:38:35 +0000
commitf55b3483bfabfc3ecf60da0faf7ec1584d15affa (patch)
tree286b899b89c9a022e4ba6132db0800e890a42c4e
parent57f4d3fb822d0563b2b6e0b670f7842a5bb1eda6 (diff)
downloadinitscripts-f55b3483bfabfc3ecf60da0faf7ec1584d15affa.tar
initscripts-f55b3483bfabfc3ecf60da0faf7ec1584d15affa.tar.gz
initscripts-f55b3483bfabfc3ecf60da0faf7ec1584d15affa.tar.bz2
initscripts-f55b3483bfabfc3ecf60da0faf7ec1584d15affa.tar.xz
initscripts-f55b3483bfabfc3ecf60da0faf7ec1584d15affa.zip
Improve Makefile so that we don't install the original versions of
patched files in /etc/rc.d and /etc/sysconfig. <cscott@cscott.net>
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a2d592d2..69b76c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,12 @@ install:
mkdir -p $(ROOT)/etc/X11
install -m755 prefdm $(ROOT)/etc/X11/prefdm
- cp -af rc.d sysconfig ppp udev $(ROOT)/etc
+ install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
+ install -m755 rc.d/rc rc.d/rc.local rc.d/rc.sysinit $(ROOT)/etc/rc.d/
+ cp -af rc.d/init.d $(ROOT)/etc/rc.d/
+ install -m755 sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
+ cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
+ cp -af ppp udev $(ROOT)/etc
mkdir -p $(ROOT)/etc/ppp/peers
chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
chmod 755 $(ROOT)/etc/ppp/peers
@@ -60,8 +65,6 @@ install:
mkdir -p $(ROOT)/etc/sysconfig/console
if uname -m | grep -q s390 ; then \
install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
- else \
- rm -f $(ROOT)/etc/sysconfig/init.s390 ; \
fi
mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin