diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 14:05:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 14:05:28 +0100 |
| commit | 8f39dc5c8c3d0b77daebd90f927e0bc78bca7d1d (patch) | |
| tree | f064c23ea4a5ac3f8dd4730997a3426f3630452d /mk | |
| parent | 80cf711c344256c59b857da6cd7fc91898f90752 (diff) | |
| parent | a03e16ce46353740a2b778beda4dda03c0252e07 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 1 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 481071261..5ba6ab1e6 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -923,12 +923,12 @@ $(eval $(call KMOD_template,SOUND,sound,\ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \ $(MODULES_DIR)/kernel/sound/core/snd \ - $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ + $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,41)) diff --git a/mk/package.mk b/mk/package.mk index cd1f47b6d..32dc5464d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -45,6 +45,7 @@ endif ifeq ($(ADK_NATIVE),y) CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ + SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 5d6d8cc30..fa1baf5cb 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -26,7 +26,7 @@ ifneq ($(filter autotool,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 \ AUTOMAKE_VERSION=1.9 \ - autoreconf -vif $(MAKE_TRACE) + autoreconf -vf;libtoolize $(MAKE_TRACE) endif ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ @@ -79,7 +79,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --prefix=/usr \ --datadir=/usr/share \ --mandir=/usr/share/man \ - --libexecdir=/usr/sbin \ + --libexecdir=/usr/libexec \ --localstatedir=/var \ --sysconfdir=/etc \ --disable-nls \ diff --git a/mk/vars.mk b/mk/vars.mk index bc1940682..2151348b0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -102,15 +102,15 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | cpio -i -d --quiet ;; \ + cat $$file | cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | cpio -i -d --quiet ;; \ + gzip -dc $$file | cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | cpio -i -d --quiet ;; \ + bzip2 -dc $$file | cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ |