[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Jul 12 04:19:19 PDT 2011
configure.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit b407a7b3b39acbcd53040bd8035596cefdfd4e94
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jul 12 13:08:14 2011 +0200
set INSTALLDIR with real path
use the already substituted $LIBDIR instead of $libdir; the later might
use $exec_prefix instead of real path
diff --git a/configure.in b/configure.in
index 6969bec..18f93d2 100755
--- a/configure.in
+++ b/configure.in
@@ -7987,11 +7987,6 @@ PREFIXDIR="$prefix"
AC_MSG_RESULT([$PREFIXDIR])
AC_SUBST(PREFIXDIR)
-AC_MSG_CHECKING([for install dir])
-INSTALLDIR="$libdir/$INSTALLDIRNAME"
-AC_MSG_RESULT([$INSTALLDIR])
-AC_SUBST(INSTALLDIR)
-
AC_MSG_CHECKING([for libdir])
LIBDIR=[$(eval echo $(eval echo $libdir))]
AC_MSG_RESULT([$LIBDIR])
@@ -8012,6 +8007,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"
More information about the Libreoffice-commits
mailing list