diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-05 15:34:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-05 15:34:35 +0200 |
commit | 3b76e79f14e279a6526809e630e45e4f760d77de (patch) | |
tree | bb479b57c7ad1362f05a0532a7133c0c5232dfeb /package/subversion/Makefile | |
parent | 9bfe4f2061f377306619fa479bc0e7adafb22125 (diff) | |
parent | 1879491b2b6e799b20ac06d1b510726eb200944f (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/subversion/Makefile')
-rw-r--r-- | package/subversion/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 3af2bc6da..4cb14937f 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -21,8 +21,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SUBVERSION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-config -CONFIGURE_ARGS+= --with-apr-util=${STAGING_DIR}/usr/bin/apr-config +CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-1-config +CONFIGURE_ARGS+= --with-apr-util=${STAGING_DIR}/usr/bin/apr-1-config CONFIGURE_ARGS+= --disable-mod-activation CONFIGURE_ARGS+= --disable-keychain CONFIGURE_ARGS+= --without-apxs @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --without-jikes CONFIGURE_ARGS+= --without-jdk CONFIGURE_ARGS+= --disable-javahl CONFIGURE_ARGS+= --without-berkeley-db -LIBS= -lsqlite3 -laprutil-0 -lapr-0 -lexpat -liconv +LIBS= -lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) CONFIGURE_ARGS+= -disable-neon-version-check |