UIMA-2053 changed install location to /usr/local/uimacpp
git-svn-id: https://svn.apache.org/repos/asf/uima/uimacpp/trunk@1360807 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Makefile.am b/Makefile.am
index 6bbf2fc..511d057 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,6 @@
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)
diff --git a/Makefile.in b/Makefile.in
index 27d804d..ec23a45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -679,7 +679,7 @@
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.
diff --git a/buildsdk.sh b/buildsdk.sh
index 7fee886..9c2487d 100755
--- a/buildsdk.sh
+++ b/buildsdk.sh
@@ -27,7 +27,7 @@
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 @@
# 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
diff --git a/configure b/configure
index da08ebc..d525663 100755
--- a/configure
+++ b/configure
@@ -731,7 +731,7 @@
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>
diff --git a/configure.ac b/configure.ac
index 678ebc5..89dc270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
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/\..*//'`
