diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-11 21:57:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-11 21:57:22 +0100 |
| commit | 5dd0d19f14b28b17f377f84dffd4bc3c10db90c5 (patch) | |
| tree | afaf8f8726841974958e46d2cef4fd21b0e61117 | |
| parent | 3fec6f434e8ff51308215f6f541031d5380f1e6f (diff) | |
| parent | 5c12e516831b195e3fd205b62b8a7f2bd3135157 (diff) | |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
| -rw-r--r-- | makefile | 35 | ||||
| -rw-r--r-- | package/pkgmaker | 2 |
2 files changed, 1 insertions, 36 deletions
diff --git a/makefile b/makefile deleted file mode 100644 index 760d123d6..000000000 --- a/makefile +++ /dev/null @@ -1,35 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -ADKVERSION= 0.1.0 -TOPDIR= ${.CURDIR} -PWD= ${.CURDIR} - -.include "${.CURDIR}/Makefile.inc" - -GMAKE_ENV+= ADKVERSION=${ADKVERSION:Q} - -.if defined(package) && !empty(package) -subdir:= package/${package} -. if !make(clean) -_subdir_dep:= ${TOPDIR}/.ADK_HAVE_DOT_CONFIG -. endif -.endif - -.if defined(subdir) && !empty(subdir) -_subdir:= ${.TARGETS} -${.TARGETS}: _subdir - -_subdir: ${_subdir_dep} - @if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \ - echo >&2 Error: you must build with “umask 022”, sorry.; \ - exit 1; \ - fi - cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \ - ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir} - -. include "${.CURDIR}/prereq.mk" -. include "${.CURDIR}/mk/split-cfg.mk" -.else -. include "${.CURDIR}/Makefile" -.endif diff --git a/package/pkgmaker b/package/pkgmaker index ccd619ac5..ea89424e7 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -43,7 +43,7 @@ done for dn in */Makefile; do dn=${dn%/*} # skip if we take care of this one manually - [[ -s $dn/Config.in.manual ]] && continue + [[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue pbar="Pass 2: $dn ..." print -nu2 "$pbar\r" cd $dn |