diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/zlib/Makefile | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/zlib/Makefile')
-rw-r--r-- | package/zlib/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 1d3b0489c..e031baf0a 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -24,9 +24,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= manual -BUILD_STYLE:= auto -INSTALL_STYLE:= auto +CONFIG_STYLE:= manual ifeq ($(ADK_NATIVE),) COPTS:= $(TARGET_CONFIGURE_OPTS) |