From d063cda7e1afd959dea908bf8bb892ce7db7fe40 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 20 Nov 2007 11:59:44 +0000 Subject: [PATCH] Move the runlevel foo to it's own Makefile for ease of maintainance --- runlevels.BSD/Makefile | 18 ++---------------- runlevels.Linux/Makefile | 18 ++---------------- runlevels.mk | 18 ++++++++++++++++++ runlevels/Makefile | 16 +++------------- 4 files changed, 25 insertions(+), 45 deletions(-) create mode 100644 runlevels.mk diff --git a/runlevels.BSD/Makefile b/runlevels.BSD/Makefile index 6c47cc7f..45285b51 100644 --- a/runlevels.BSD/Makefile +++ b/runlevels.BSD/Makefile @@ -1,21 +1,7 @@ BOOTLEVEL = net.lo0 sysctl syscons DEFAULT = -LEVELDIR = $(DESTDIR)/etc/runlevels -BOOTDIR = $(LEVELDIR)/boot -DEFAULTDIR = $(LEVELDIR)/default - -install: - if ! test -d "$(BOOTDIR)" ; then \ - $(INSTALL) -d $(BOOTDIR) || exit $$?; \ - for x in $(BOOT); do ln -snf ../../init.d/"$$x" $(BOOTDIR)/"$$x" || exit $$? ; done \ - fi - if ! test -d "$(DEFAULTDIR)" ; then \ - $(INSTALL) -d $(DEFAULTDIR) || exit $$?; \ - for x in $(DEFAULT); do ln -snf ../../init.d/"$$x" $(DEFAULTDIR)/"$$x" || exit $$? ; done \ - fi - -all: -clean: +TOPDIR = .. +include $(TOPDIR)/runlevels.mk # vim: set ts=4 : diff --git a/runlevels.Linux/Makefile b/runlevels.Linux/Makefile index f3ccc551..4a73e7b9 100644 --- a/runlevels.Linux/Makefile +++ b/runlevels.Linux/Makefile @@ -1,21 +1,7 @@ BOOT = consolefont keymaps modules net.lo DEFAULT = hdparm -LEVELDIR = $(DESTDIR)/etc/runlevels -BOOTDIR = $(LEVELDIR)/boot -DEFAULTDIR = $(LEVELDIR)/default - -install: - if ! test -d "$(BOOTDIR)" ; then \ - $(INSTALL) -d $(BOOTDIR) || exit $$?; \ - for x in $(BOOT); do ln -snf ../../init.d/"$$x" $(BOOTDIR)/"$$x" || exit $$? ; done \ - fi - if ! test -d "$(DEFAULTDIR)" ; then \ - $(INSTALL) -d $(DEFAULTDIR) || exit $$?; \ - for x in $(DEFAULT); do ln -snf ../../init.d/"$$x" $(DEFAULTDIR)/"$$x" || exit $$? ; done \ - fi - -all: -clean: +TOPDIR = .. +include $(TOPDIR)/runlevels.mk # vim: set ts=4 : diff --git a/runlevels.mk b/runlevels.mk new file mode 100644 index 00000000..cad2ff7e --- /dev/null +++ b/runlevels.mk @@ -0,0 +1,18 @@ +# Handy runlevel stuff + +LEVELDIR = $(DESTDIR)/etc/runlevels +BOOTDIR = $(LEVELDIR)/boot +DEFAULTDIR = $(LEVELDIR)/default + +install: + if ! test -d "$(BOOTDIR)" ; then \ + $(INSTALL) -d $(BOOTDIR) || exit $$?; \ + for x in $(BOOT); do ln -snf ../../init.d/"$$x" $(BOOTDIR)/"$$x" || exit $$? ; done \ + fi + if ! test -d "$(DEFAULTDIR)" ; then \ + $(INSTALL) -d $(DEFAULTDIR) || exit $$?; \ + for x in $(DEFAULT); do ln -snf ../../init.d/"$$x" $(DEFAULTDIR)/"$$x" || exit $$? ; done \ + fi + +all: +clean: diff --git a/runlevels/Makefile b/runlevels/Makefile index f57eae02..feb7e452 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -1,21 +1,11 @@ -BOOT = bootmisc checkroot checkfs clock hostname localmount rmnologin urandom +BOOT = bootmisc checkroot checkfs clock hostname localmount rmnologin sysctl urandom DEFAULT = local netmount LEVELDIR = $(DESTDIR)/etc/runlevels BOOTDIR = $(LEVELDIR)/boot DEFAULTDIR = $(LEVELDIR)/default -install: - if ! test -d "$(BOOTDIR)" ; then \ - $(INSTALL) -d $(BOOTDIR) || exit $$?; \ - for x in $(BOOT); do ln -snf ../../init.d/"$$x" $(BOOTDIR)/"$$x" || exit $$? ; done \ - fi - if ! test -d "$(DEFAULTDIR)" ; then \ - $(INSTALL) -d $(DEFAULTDIR) || exit $$?; \ - for x in $(DEFAULT); do ln -snf ../../init.d/"$$x" $(DEFAULTDIR)/"$$x" || exit $$? ; done \ - fi - -all: -clean: +TOPDIR = .. +include $(TOPDIR)/runlevels.mk # vim: set ts=4 :