Index: configure --- configure.orig 2009-11-23 04:11:00 +0100 +++ configure 2010-01-05 17:30:54 +0100 @@ -24069,7 +24069,7 @@ #define USE_ECAP 1 _ACEOF - ECAP_LIBS="ecap/libecap.la $ECAP_LIBS" + ECAP_LIBS="adaptation/ecap/libecap.la $ECAP_LIBS" use_adaptation=yes else Index: errors/Makefile.in --- errors/Makefile.in.orig 2009-11-23 04:10:30 +0100 +++ errors/Makefile.in 2010-01-05 17:32:19 +0100 @@ -545,7 +545,7 @@ $(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \ $(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \ $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \ - $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ; + $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)" "$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ; uninstall-local: for l in $(TRANSLATE_LANGUAGES) templates; do \ @@ -572,7 +572,7 @@ rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT upgrade: install - $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ; + $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)" "$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ; # undocumented hack. You can use this target to create multi-lingual # error pages. For example: Index: errors/alias-link.sh --- errors/alias-link.sh.orig 2009-11-23 04:09:53 +0100 +++ errors/alias-link.sh 2010-01-05 17:32:41 +0100 @@ -8,8 +8,9 @@ LN="${1}" RM="${2}" -DIR="${3}" -ALIASFILE="${4}" +DESTDIR="${3}" +DIR="${4}" +ALIASFILE="${5}" if ! test -f ${ALIASFILE} ; then echo "FATAL: Alias file ${ALIASFILE} does not exist!" @@ -37,7 +38,7 @@ # split aliases based on whitespace and create a symlink for each # Remove and replace any pre-existing content/link for alia in ${aliases}; do - ${RM} -f -r ${DIR}/${alia} || exit 1 - ${LN} -s ${base} ${DIR}/${alia} || exit 1 + ${RM} -f -r ${DESTDIR}${DIR}/${alia} || exit 1 + ${LN} -s ${DIR}/${base} ${DESTDIR}${DIR}/${alia} || exit 1 done done Index: src/Makefile.in --- src/Makefile.in.orig 2009-11-23 04:10:37 +0100 +++ src/Makefile.in 2010-01-05 17:30:54 +0100 @@ -1407,7 +1407,7 @@ LIBADD_DL = @LIBADD_DL@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @ECAP_LIBS@ @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ LIB_DB = @LIB_DB@