diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /mk/vars.mk | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index f9e8798d6..5532cb07f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -86,7 +86,11 @@ IPKG:= IPKG_TMP=$(BUILD_DIR)/tmp \ ${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends IPKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg +ifeq ($(ADK_NATIVE),y) +RSTRIP:= prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh +else RSTRIP:= prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh +endif EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ |