[CalendarServer-changes] [7511] CalendarServer/trunk/support/build.sh

[source_changes at macosforge.org]

Revision: 7511
          http://trac.macosforge.org/projects/calendarserver/changeset/7511
Author:   wsanchez at apple.com
Date:     2011-05-20 10:39:15 -0700 (Fri, 20 May 2011)
Log Message:
-----------
Cleanup

Modified Paths:
--------------
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2011-05-20 16:07:36 UTC (rev 7510)
+++ CalendarServer/trunk/support/build.sh	2011-05-20 17:39:15 UTC (rev 7511)
@@ -529,21 +529,23 @@
 
   www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
 
+  local dstroot="${srcdir}/_root";
+
   if "${do_setup}" && (
-      "${force_setup}" || [ ! -d "${srcdir}/_root" ]); then
+      "${force_setup}" || [ ! -d "${dstroot}" ]); then
     echo "Building ${name}...";
     cd "${srcdir}";
-    ./configure --prefix="${srcdir}/_root" "$@";
+    ./configure --prefix="${dstroot}" "$@";
     jmake;
     jmake install;
   fi;
 
-  export              PATH="${PATH}:${srcdir}/_root/bin";
-  export    C_INCLUDE_PATH="${C_INCLUDE_PATH:-}:${srcdir}/_root/include";
-  export   LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${srcdir}/_root/lib";
-  export          CPPFLAGS="${CPPFLAGS:-} -I${srcdir}/_root/include";
-  export           LDFLAGS="${LDFLAGS:-} -L${srcdir}/_root/lib";
-  export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${srcdir}/_root/lib";
+  export              PATH="${PATH}:${dstroot}/bin";
+  export    C_INCLUDE_PATH="${C_INCLUDE_PATH:-}:${dstroot}/include";
+  export   LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:${dstroot}/lib";
+  export          CPPFLAGS="${CPPFLAGS:-} -I${dstroot}/include";
+  export           LDFLAGS="${LDFLAGS:-} -L${dstroot}/lib";
+  export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH:-}:${dstroot}/lib";
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110520/6eb55be8/attachment-0001.html>