[Libreoffice-commits] .: configure.in Makefile.in set_soenv.in

[Tomáš Chvátal]

 Makefile.in  |    8 ++++----
 configure.in |   13 +++++++++++++
 set_soenv.in |    2 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit a7d38f57cc0bc8d8b941f17e1fd5b8f9eb3a87c9
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Sun Sep 18 08:41:21 2011 +0200

    Revert "Remove once again the INSTALLDIR feature"
    
    This reverts commit bf0ea5c4eefa122febaaa5e6da8ecf4b1869f991.
    
    Those variables are used in bin/distro-install-*.
    Unable to find any issue with both distro-install and dev-install so
    reverting.
    If something really does break it needs fixing. Reverting this is not
    an option.

diff --git a/Makefile.in b/Makefile.in
index 1cad501..715d61d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,12 +57,12 @@ cross-build-toolset:
 
 install: build
 	@. ./Env.Host.sh && \
-	echo "Installing in @PREFIXDIR at ..." && \
-	ooinstall "@PREFIXDIR@" && \
+	echo "Installing in @INSTALLDIR at ..." && \
+	ooinstall "@INSTALLDIR@" && \
 	echo "" && \
 	echo "Installation finished, you can now execute:" && \
-	echo "@PREFIXDIR@/program/soffice" && \
-	install-gdb-printers -a "@PREFIXDIR@"
+	echo "@INSTALLDIR@/program/soffice" && \
+	install-gdb-printers -a "@INSTALLDIR@"
 
 distro-pack-install: install
 	./bin/distro-install-clean-up
diff --git a/configure.in b/configure.in
index edc956a..4d26a47 100755
--- a/configure.in
+++ b/configure.in
@@ -9168,6 +9168,14 @@ PRODUCTNAME=AC_PACKAGE_NAME
 AC_MSG_RESULT([$PRODUCTNAME])
 AC_SUBST(PRODUCTNAME)
 
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]`
+AC_MSG_CHECKING([for install dirname])
+if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then
+   INSTALLDIRNAME="$with_install_dirname"
+fi
+AC_MSG_RESULT([$INSTALLDIRNAME])
+AC_SUBST(INSTALLDIRNAME)
+
 AC_MSG_CHECKING([for prefix])
 PREFIXDIR="$prefix"
 AC_MSG_RESULT([$PREFIXDIR])
@@ -9193,6 +9201,11 @@ DOCDIR=[$(eval echo $(eval echo $docdir))]
 AC_MSG_RESULT([$DOCDIR])
 AC_SUBST(DOCDIR)
 
+AC_MSG_CHECKING([for install dir])
+INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
+AC_MSG_RESULT([$INSTALLDIR])
+AC_SUBST(INSTALLDIR)
+
 AC_MSG_CHECKING([whether to statically link to Gtk])
 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
     ENABLE_STATIC_GTK="TRUE"
diff --git a/set_soenv.in b/set_soenv.in
index 24088dd..aad44a0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1473,7 +1473,9 @@ ToFile( "VALGRIND_CFLAGS",   "@VALGRIND_CFLAGS@","e" );
 ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
 ToFile( "UNIXWRAPPERNAME",   "@UNIXWRAPPERNAME@","e" );
 ToFile( "PRODUCTNAME",       "@PRODUCTNAME@",    "e" );
+ToFile( "INSTALLDIRNAME",    "@INSTALLDIRNAME@", "e" );
 ToFile( "PREFIXDIR",         "@PREFIXDIR@",      "e" );
+ToFile( "INSTALLDIR",        "@INSTALLDIR@",     "e" );
 ToFile( "LIBDIR",            "@LIBDIR@",         "e" );
 ToFile( "DATADIR",           "@DATADIR@",        "e" );
 ToFile( "MANDIR",            "@MANDIR@",         "e" );