summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/depmaker3
-rw-r--r--package/grub-bin/Makefile2
-rw-r--r--package/pkgmaker3
-rw-r--r--rules.mk1
4 files changed, 7 insertions, 2 deletions
diff --git a/package/depmaker b/package/depmaker
index edbacc6f1..da3923554 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -1,3 +1,5 @@
+unset MAKEFLAGS
+export MAKEFLAGS=s
cd "$(dirname "$0")"
export TOPDIR=$(realpath ..)
if gmake --help >/dev/null 2>&1; then
@@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then
else
export GMAKE=make
fi
+GMAKE="$GMAKE --no-print-directory"
(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
typeset -L$x_cols pbar
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 260a29393..30a956818 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -13,7 +13,7 @@ PKG_DESCR:= GRUB bootloader
PKG_SECTION:= sys
PKG_SITES:= http://openadk.org/distfiles/
-PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix1d
+PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d
include ${TOPDIR}/mk/package.mk
diff --git a/package/pkgmaker b/package/pkgmaker
index f00285192..d9c928579 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -1,3 +1,5 @@
+unset MAKEFLAGS
+export MAKEFLAGS=s
cd "$(dirname "$0")"
export TOPDIR=$(realpath ..)
if gmake --help >/dev/null 2>&1; then
@@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then
else
export GMAKE=make
fi
+GMAKE="$GMAKE --no-print-directory"
(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
typeset -L$x_cols pbar
diff --git a/rules.mk b/rules.mk
index 9703704a9..684206815 100644
--- a/rules.mk
+++ b/rules.mk
@@ -43,7 +43,6 @@ TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS})
TARGET_CC:= $(strip ${TARGET_CC})
TARGET_CXX:= $(strip ${TARGET_CXX})
-# I hate GNU make! --mirabilos
ifneq (${show},)
.DEFAULT_GOAL:= show
show: