diff options
author | Tom Gundersen <teg@jklm.no> | 2011-06-08 01:11:37 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-08 01:11:37 +0200 |
commit | 663f5e917994b674d4fbe184ff262f94da11256e (patch) | |
tree | 72fafb4d759960bb2b729910b6a84498ceca18ba /Makefile | |
parent | 3ac781f2f188b4e9c698aba7ede6154a64ffc679 (diff) | |
parent | 32047175759770ac0b37a1fede68a13e2b4d4fdd (diff) | |
download | initscripts-663f5e917994b674d4fbe184ff262f94da11256e.tar.xz |
Merge branch 'snowman'
Conflicts:
rc.multi
rc.single
Trivial conflict, and fixed a bug introduced when I imported the patches in the first place (oops).
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,5 @@ VER := $(shell git describe) -DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /sbin /etc/bash_completion.d /usr/share/zsh/site-functions +DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/logrotate.d /sbin /etc/bash_completion.d /usr/share/zsh/site-functions minilogd: minilogd.o @@ -9,6 +9,7 @@ installdirs: install: minilogd installdirs install -m644 -t $(DESTDIR)/etc inittab rc.conf install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit + install -m644 -t $(DESTDIR)/etc/logrotate.d bootlog install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs install -m755 -t $(DESTDIR)/sbin minilogd rc.d |