Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

makefile

@@ -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

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