summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-11-14 16:39:07 +0000
committerRoy Marples <roy@marples.name>2007-11-14 16:39:07 +0000
commited20354fdbcf8e34f8346728390decc4cff302b1 (patch)
treefa93898410cfa169cd6a52d6127eb8797971af60
parent4888f3c97d8e239005e3ccc6a4da46ab2f354564 (diff)
downloadopenrc-ed20354fdbcf8e34f8346728390decc4cff302b1.tar.gz
openrc-ed20354fdbcf8e34f8346728390decc4cff302b1.tar.bz2
openrc-ed20354fdbcf8e34f8346728390decc4cff302b1.tar.xz
add etc back for BSD installing rc and rc.shutdown
-rw-r--r--Makefile2
-rw-r--r--default.mk8
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 28fca01..9d4eaba 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ NAME = openrc
VERSION = 1.0pre1
PKG = $(NAME)-$(VERSION)
-SUBDIRS = conf.d init.d man net sh src
+SUBDIRS = etc conf.d init.d man net sh src
ifeq ($(OS),)
OS=$(shell uname -s)
diff --git a/default.mk b/default.mk
index 6cbe1b7..4285199 100644
--- a/default.mk
+++ b/default.mk
@@ -20,13 +20,13 @@ install:: $(SUBDIRS_INSTALL)
# Hmm ... possible to combine these three and not be ugly ?
%_all:
- $(MAKE) -C $(patsubst %_all,%,$@) all
- if test -d $(patsubst %_all,%,$@).$(OS) ; then $(MAKE) -C $(patsubst %_all,%,$@).$(OS) all ; fi
+ if test -d $(patsubst %_all,%,$@); then $(MAKE) -C $(patsubst %_all,%,$@).$(OS) all; fi
+ if test -d $(patsubst %_all,%,$@).$(OS); then $(MAKE) -C $(patsubst %_all,%,$@).$(OS) all; fi
%_clean:
- $(MAKE) -C $(patsubst %_clean,%,$@) clean
+ if test -d $(patsubst %_clean,%,$@) ; then $(MAKE) -C $(patsubst %_clean,%,$@) clean ; fi
if test -d $(patsubst %_clean,%,$@).$(OS) ; then $(MAKE) -C $(patsubst %_clean,%,$@).$(OS) clean ; fi
%_install:
- $(MAKE) -C $(patsubst %_install,%,$@) install
+ if test -d $(patsubst %_install,%,$@) ; then $(MAKE) -C $(patsubst %_install,%,$@) install ; fi
if test -d $(patsubst %_install,%,$@).$(OS) ; then $(MAKE) -C $(patsubst %_install,%,$@).$(OS) install ; fi