diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rwxr-xr-x | configure.in | 13 | ||||
| -rwxr-xr-x | set_soenv.in | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 1cad501607f0..715d61d6cf18 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,12 +57,12 @@ cross-build-toolset: install: build @. ./Env.Host.sh && \ - echo "Installing in @PREFIXDIR@..." && \ - ooinstall "@PREFIXDIR@" && \ + echo "Installing in @INSTALLDIR@..." && \ + 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 edc956ae7cf5..4d26a474b9f1 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 24088ddf46b0..aad44a076607 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" ); |