mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove once again the INSTALLDIR feature

Browse Source 
It was reintroduced with a merge from the 3.4 branch
This commit is contained in:
François Tigeot
2011-08-23 14:48:21 +02:00
parent 4e0691b9b3
commit bf0ea5c4ee
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -26,12 +26,12 @@ cross-build-toolset:
install: install:
@. ./Env.Host.sh && \ @. ./Env.Host.sh && \
echo "Installing in @INSTALLDIR@..." && \ echo "Installing in @PREFIXDIR@..." && \
ooinstall "@INSTALLDIR@" && \ ooinstall "@PREFIXDIR@" && \
echo "" && \ echo "" && \
echo "Installation finished, you can now execute:" && \ echo "Installation finished, you can now execute:" && \
echo "@INSTALLDIR@/program/soffice" && \ echo "@PREFIXDIR@/program/soffice" && \
install-gdb-printers -a "@INSTALLDIR@" install-gdb-printers -a "@PREFIXDIR@"
distro-pack-install: install distro-pack-install: install
./bin/distro-install-clean-up ./bin/distro-install-clean-up

13
configure.in
View File

@@ -8937,14 +8937,6 @@ PRODUCTNAME=AC_PACKAGE_NAME
AC_MSG_RESULT([$PRODUCTNAME]) AC_MSG_RESULT([$PRODUCTNAME])
AC_SUBST(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]) AC_MSG_CHECKING([for prefix])
PREFIXDIR="$prefix" PREFIXDIR="$prefix"
AC_MSG_RESULT([$PREFIXDIR]) AC_MSG_RESULT([$PREFIXDIR])
@@ -8970,11 +8962,6 @@ DOCDIR=[$(eval echo $(eval echo $docdir))]
AC_MSG_RESULT([$DOCDIR]) AC_MSG_RESULT([$DOCDIR])
AC_SUBST(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]) AC_MSG_CHECKING([whether to statically link to Gtk])
if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
ENABLE_STATIC_GTK="TRUE" ENABLE_STATIC_GTK="TRUE"

2
set_soenv.in
View File

@@ -1531,9 +1531,7 @@ ToFile( "VALGRIND_CFLAGS", "@VALGRIND_CFLAGS@","e" );
ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" ); ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" ); ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" );
ToFile( "PRODUCTNAME", "@PRODUCTNAME@", "e" ); ToFile( "PRODUCTNAME", "@PRODUCTNAME@", "e" );
ToFile( "INSTALLDIRNAME", "@INSTALLDIRNAME@", "e" );
ToFile( "PREFIXDIR", "@PREFIXDIR@", "e" ); ToFile( "PREFIXDIR", "@PREFIXDIR@", "e" );
ToFile( "INSTALLDIR", "@INSTALLDIR@", "e" );
ToFile( "LIBDIR", "@LIBDIR@", "e" ); ToFile( "LIBDIR", "@LIBDIR@", "e" );
ToFile( "DATADIR", "@DATADIR@", "e" ); ToFile( "DATADIR", "@DATADIR@", "e" );
ToFile( "MANDIR", "@MANDIR@", "e" ); ToFile( "MANDIR", "@MANDIR@", "e" );