1 files changed, 8 insertions, 13 deletions

diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 2a96d70..523d8ee 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -15,23 +15,17 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
-    set(WINLIBS_PREBUILT_DEBUG_DIR 
-      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
-      )
-    set(WINLIBS_PREBUILT_RELEASE_DIR 
-      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-      )
     set(APR_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
       )
     set(APRICONV_LIBRARIES 
-      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
-      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
       )
   elseif (DARWIN)
     set(APR_LIBRARIES 
@@ -42,10 +36,11 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
       )
-    set(APRICONV_LIBRARIES apriconv-1)
+    set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
     set(APR_LIBRARIES apr-1)
     set(APRUTIL_LIBRARIES aprutil-1)
+    set(APRICONV_LIBRARIES iconv)
   endif (WINDOWS)
   set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)