[Libreoffice-commits] core.git: configure.ac

[Michael Weghorn (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90be6c5cbde6d86da10960e2fee13164c43b9d14
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jun 12 17:25:59 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Jun 12 23:15:04 2019 +0200

    configure.ac: Drop extra '/' for KF5 includes
    
    Drop the  extra '/' resulting in the include in path, like e.g.
    '-isystem /usr/include//KF5/KCoreAddons'.
    
    Change-Id: I6b1814b91c17926309b5a0567d4d1338a691e92e
    Reviewed-on: https://gerrit.libreoffice.org/73894
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/configure.ac b/configure.ac
index fa58f9ff3591..2586ca81c1bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11182,7 +11182,7 @@ then
         kf5_haiku_libdirs="`findpaths -c ' ' -a $haiku_arch B_FIND_PATH_DEVELOP_LIB_DIRECTORY`"
     fi
 
-    kf5_incdirs="$KF5INC /usr/include/ $kf5_haiku_incdirs $x_includes"
+    kf5_incdirs="$KF5INC /usr/include $kf5_haiku_incdirs $x_includes"
     kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $kf5_haiku_libdirs $x_libraries"
     if test -n "$supports_multilib"; then
         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"