updated for latest include locations

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6134 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-01-26 00:51:12 +00:00
parent a3ea75219b
commit 0ecc43fb0d
2 changed files with 22 additions and 11 deletions

View File

@ -204,9 +204,17 @@ install() {
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/phreeqc/revisions" "${instdir}/${FULLPKG}-vs2005-win32/doc/RELEASE.txt" && \
/usr/bin/install -m 755 "${objdir}/lib/"* "${instdir}/${FULLPKG}-vs2005-win32/lib/." && \
/usr/bin/install -m 755 "${objdir}/dll/"* "${instdir}/${FULLPKG}-vs2005-win32/dll/." && \
/usr/bin/install -m 755 "${objdir}/include/"* "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f.inc" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f90.inc" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.hpp" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqcCallbacks.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/Var.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/PHRQ_io.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/Keywords.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \
/usr/bin/install -m 755 "${objdir}/database/"*.dat "${instdir}/${FULLPKG}-vs2005-win32/database/." && \
/usr/bin/install -m 755 "${objdir}/examples/c/advect/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/c/advect/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/excel/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/com/excel/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/python/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python/." && \
/usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran/advect/." && \
@ -230,9 +238,17 @@ install() {
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/phreeqc/revisions" "${instdir}/${FULLPKG}-vs2005-x64/doc/RELEASE.txt" && \
/usr/bin/install -m 755 "${objdir}/libx64/"* "${instdir}/${FULLPKG}-vs2005-x64/libx64/." && \
/usr/bin/install -m 755 "${objdir}/dllx64/"* "${instdir}/${FULLPKG}-vs2005-x64/dllx64/." && \
/usr/bin/install -m 755 "${objdir}/include/"* "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f.inc" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f90.inc" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqc.hpp" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/IPhreeqcCallbacks.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/Var.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/PHRQ_io.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/src/phreeqcpp/Keywords.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \
/usr/bin/install -m 755 "${objdir}/database/"*.dat "${instdir}/${FULLPKG}-vs2005-x64/database/." && \
/usr/bin/install -m 755 "${objdir}/examples/c/advect/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/c/advect/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/excel/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/excel/." && \
/usr/bin/install -m 755 "${objdir}/examples/com/python/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python/." && \
/usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran/advect/." && \

View File

@ -147,19 +147,14 @@ echo "Removed and recreated $DIST_SANDBOX"
echo "Exporting revision $REVISION of IPhreeqc into sandbox..."
(cd "$DIST_SANDBOX" && \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \
"http://internalbrr.cr.usgs.gov/svn_GW/IPhreeqc/$REPOS_PATH" \
"http://internalbrr.cr.usgs.gov/svn_GW/IPhreeqc/branches/ErrorHandling" \
"$DISTNAME")
(cd "$DIST_SANDBOX" && \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/$REPOS_PATH/src" \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "6109" \
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/branches/ErrorHandling/src" \
"$DISTNAME/src/phreeqcpp")
(cd "$DIST_SANDBOX" && \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/$REPOS_PATH/src" \
"$DISTNAME/src/phreeqcpp/phreeqc")
(cd "$DIST_SANDBOX" && \
${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/$REPOS_PATH/database" \