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

[François Tigeot]

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

New commits:
commit bf0ea5c4eefa122febaaa5e6da8ecf4b1869f991
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Tue Aug 23 14:48:21 2011 +0200

    Remove once again the INSTALLDIR feature
    
    It was reintroduced with a merge from the 3.4 branch

diff --git a/Makefile.in b/Makefile.in
index 6ea879e..2464beb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,12 +26,12 @@ cross-build-toolset:
 
 install:
 	@. ./Env.Host.sh && \
-	echo "Installing in @INSTALLDIR at ..." && \
-	ooinstall "@INSTALLDIR@" && \
+	echo "Installing in @PREFIXDIR at ..." && \
+	ooinstall "@PREFIXDIR@" && \
 	echo "" && \
 	echo "Installation finished, you can now execute:" && \
-	echo "@INSTALLDIR@/program/soffice" && \
-	install-gdb-printers -a "@INSTALLDIR@"
+	echo "@PREFIXDIR@/program/soffice" && \
+	install-gdb-printers -a "@PREFIXDIR@"
 
 distro-pack-install: install
 	./bin/distro-install-clean-up
diff --git a/configure.in b/configure.in
index 6a299e3..7673bcd 100755
--- a/configure.in
+++ b/configure.in
@@ -8937,14 +8937,6 @@ 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])
@@ -8970,11 +8962,6 @@ 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 3af5ab9..7b574ad 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1531,9 +1531,7 @@ 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" );