diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
| commit | b448bbcdab09b70b4d03ea0bc9167878e7f054da (patch) | |
| tree | 40ea72e4979ce176f6280b25368713122bee1b9c | |
| parent | d804be5baee6590ff6e91d267c8cb9933ed7ac60 (diff) | |
| parent | d2e5a673aa7637c990ca7307e831327eb67e3fe7 (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
129 files changed, 35222 insertions, 30267 deletions
diff --git a/BSDmakefile b/BSDmakefile index 64050b550..477fc6d94 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -26,6 +26,5 @@ _subdir: ${_subdir_dep} . include "${.CURDIR}/prereq.mk" . include "${.CURDIR}/mk/split-cfg.mk" .else -. include "${.CURDIR}/prereq.mk" . include "${.CURDIR}/Makefile" .endif diff --git a/mk/image.mk b/mk/image.mk index 5b0408aa3..e80ac5d1e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -43,7 +43,7 @@ image-prepare-post: |