diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
| commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
| tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/heimdal | |
| parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
| parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/heimdal')
| -rw-r--r-- | package/heimdal/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index dfffe8523..ca7f3e93c 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -56,8 +56,8 @@ endif ifeq ($(ADK_COMPILE_HEIMDAL_WITH_LDAP),y) CONFIGURE_ARGS+= --with-openldap=yes -CONFIGURE_ARGS+= --with-openldap-include=${STAGING_DIR}/usr -CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-openldap-include=${STAGING_TARGET_DIR}/usr +CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-openldap endif @@ -68,9 +68,9 @@ else CONFIGURE_OPTS+= --disable-pk-init endif -TCFLAGS+= -I${STAGING_DIR}/usr/include/et -pthread +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread -CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_TOOLS}/bin +CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= cross_compiling=yes \ ac_cv_func_getaddrinfo_numserv=yes @@ -80,7 +80,7 @@ endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure --prefix=$(STAGING_TOOLS) \ + ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ --without-openldap \ --disable-otp \ @@ -92,9 +92,9 @@ pre-configure: ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) ${INSTALL_BIN} ${WRKBUILD}/lib/roken/make-roken$(EXEEXT) \ - ${STAGING_TOOLS}/bin + ${STAGING_HOST_DIR}/bin ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \ - ${STAGING_TOOLS}/bin + ${STAGING_HOST_DIR}/bin ${MAKE} -C ${WRKBUILD}/lib/roken install ${MAKE} -C ${WRKBUILD}/lib/asn1 install ${MAKE} -C ${WRKBUILD}/lib/asn1 clean |