Author: mladen.turk(a)jboss.com Date: 2008-01-05 07:53:59 -0500 (Sat, 05 Jan 2008) New Revision: 1271 Modified: trunk/build/unix/build.sh Log: Fix build paths for standalone builds from src package Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-01-03 17:17:20 UTC (rev 1270) +++ trunk/build/unix/build.sh 2008-01-05 12:53:59 UTC (rev 1271) @@ -104,7 +104,7 @@ if [ $TYPE = "src" ]; then build_version=`basename ${build_top} | awk -F - '{ print $(NF-1) }'` else - build_version=`basename ${build_top} | awk -F - '{ print $(NF-2) }'` + build_version=`basename ${build_top} | awk -F - '{ print $(NF-3) "-" $(NF-2) }'` fi echo "build_version : $build_version" echo "PACKAGE : $PACKAGE" @@ -338,10 +338,17 @@ if $has_openssl; then package_build_name=${package_build_name}-ssl fi -package_src_dir=${build_working_dir}/${package_src_name} -export package_src_dir -package_dist_dir=${build_working_dir}/${package_src_name}/dist/${BUILD_TAG} -package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG} +if [ -d srclib ]; then + package_src_dir=${build_top} + export package_src_dir + package_dist_dir=${build_top}/dist/${BUILD_TAG} + package_output_dir=${build_top}/output/${BUILD_TAG} +else + package_src_dir=${build_working_dir}/${package_src_name} + export package_src_dir + package_dist_dir=${build_working_dir}/${package_src_name}/dist/${BUILD_TAG} + package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG} +fi # Override a shell command # # $1=script $2..n