You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bh...@apache.org on 2012/07/12 18:42:44 UTC
svn commit: r1360807 - in /uima/uimacpp/trunk: Makefile.am Makefile.in
buildsdk.sh configure configure.ac
Author: bhavani
Date: Thu Jul 12 16:42:44 2012
New Revision: 1360807
URL: http://svn.apache.org/viewvc?rev=1360807&view=rev
Log:
UIMA-2053 changed install location to /usr/local/uimacpp
Modified:
uima/uimacpp/trunk/Makefile.am
uima/uimacpp/trunk/Makefile.in
uima/uimacpp/trunk/buildsdk.sh
uima/uimacpp/trunk/configure
uima/uimacpp/trunk/configure.ac
Modified: uima/uimacpp/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.am?rev=1360807&r1=1360806&r2=1360807&view=diff
==============================================================================
--- uima/uimacpp/trunk/Makefile.am (original)
+++ uima/uimacpp/trunk/Makefile.am Thu Jul 12 16:42:44 2012
@@ -37,6 +37,6 @@ docs: docs/html/index.html
docs/html/index.html:
cd docs && ./builddocs.sh
-sdk: install/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
+sdk: $(DESTDIR)usr/local/uimacpp/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) in target directory $(TARGETDIR)"
export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) APU_HOME=$(apu_install) && ./buildsdk.sh $(TARGETDIR)
Modified: uima/uimacpp/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.in?rev=1360807&r1=1360806&r2=1360807&view=diff
==============================================================================
--- uima/uimacpp/trunk/Makefile.in (original)
+++ uima/uimacpp/trunk/Makefile.in Thu Jul 12 16:42:44 2012
@@ -679,7 +679,7 @@ docs: docs/html/index.html
docs/html/index.html:
cd docs && ./builddocs.sh
-sdk: install/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
+sdk: $(DESTDIR)usr/local/uimacpp/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) $(apu_install)
echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install) in target directory $(TARGETDIR)"
export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) ACTIVEMQ_HOME=$(activemq_install) APU_HOME=$(apu_install) && ./buildsdk.sh $(TARGETDIR)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: uima/uimacpp/trunk/buildsdk.sh
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildsdk.sh?rev=1360807&r1=1360806&r2=1360807&view=diff
==============================================================================
--- uima/uimacpp/trunk/buildsdk.sh (original)
+++ uima/uimacpp/trunk/buildsdk.sh Thu Jul 12 16:42:44 2012
@@ -27,7 +27,7 @@ usage() {
echo " in the docs directory of the uimacpp source tree."
echo " Requires the following environment variables:"
echo " UIMA_INSTALLDIR - 'install' location of uimacpp build."
- echo " Defaults to ./install"
+ echo " Defaults to ./usr/local/uimacpp"
echo " APR_HOME - root of the APR install."
echo " ICU_HOME - root of the ICU install."
echo " XERCES_HOME - root of the XERCES install."
@@ -101,7 +101,7 @@ fi
# set default values if not set
if [ "$UIMA_INSTALLDIR" = "" ]; then
- export UIMA_INSTALLDIR=$UIMACPP_SOURCE/install
+ export UIMA_INSTALLDIR=$UIMACPP_SOURCE/usr/local/uimacpp
fi
if [[ "$APR_HOME" = "" || "$ICU_HOME" = "" || "$XERCES_HOME" = "" ]]; then
Modified: uima/uimacpp/trunk/configure
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure?rev=1360807&r1=1360806&r2=1360807&view=diff
==============================================================================
--- uima/uimacpp/trunk/configure (original)
+++ uima/uimacpp/trunk/configure Thu Jul 12 16:42:44 2012
@@ -731,7 +731,7 @@ PACKAGE_STRING='uimacpp 2.4.0'
PACKAGE_BUGREPORT=''
ac_unique_file="src/framework/engine.cpp"
-ac_default_prefix=/install
+ac_default_prefix=/usr/local/uimacpp
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
Modified: uima/uimacpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1360807&r1=1360806&r2=1360807&view=diff
==============================================================================
--- uima/uimacpp/trunk/configure.ac (original)
+++ uima/uimacpp/trunk/configure.ac Thu Jul 12 16:42:44 2012
@@ -23,7 +23,7 @@ AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_MACRO_DIR([m4])
AC_DISABLE_STATIC
-AC_PREFIX_DEFAULT(/install)
+AC_PREFIX_DEFAULT(/usr/local/uimacpp)
#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
#LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`