autogen.sh | 4 ++--
configure.ac | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 966aa588964fef159b3dce45ea2dc70389a975af
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Aug 27 13:16:09 2018 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Aug 27 13:24:46 2018 +0200
capitalization in a configure message
Change-Id: I0a6a4c119cab8948b34fb6f32d8ec5066426e42e
diff --git a/configure.ac b/configure.ac
index 85315fa473a7..72d560d1b8d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6098,7 +6098,7 @@ dnl
===================================================================
dnl Identify the C++ library
dnl ===================================================================
-AC_MSG_CHECKING([What the C++ library is])
+AC_MSG_CHECKING([what the C++ library is])
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <utility>
commit 1de0901d226e6851f6c75fc3a834e9a5fcaa5e98
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Aug 21 15:08:42 2018 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Aug 27 13:24:42 2018 +0200
avoid error message about removing non-existent file
If it's a first build, there are no Makefiles in the build dir.
Change-Id: Idec99145a5fb273921f58d92013a1c882cb8b026
diff --git a/autogen.sh b/autogen.sh
index 1f3bb813fbbf..8c0bb0ade4ba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -175,7 +175,7 @@ if ($src_path ne $build_path)
{
my $dir = basename (dirname ($module));
mkdir ($dir);
- system ("rm $dir/Makefile");
+ system ("rm -f $dir/Makefile");
system ("printf 'module_directory:=$src_path_win/$dir/\ninclude
\$(module_directory)/../solenv/gbuild/partial_build.mk\n' > $dir/Makefile");
}
my @external_modules = <$src_path/external/*/Makefile>;
@@ -185,7 +185,7 @@ if ($src_path ne $build_path)
{
my $dir = basename (dirname ($module));
mkdir ("external/$dir");
- system ("rm external/$dir/Makefile");
+ system ("rm -f external/$dir/Makefile");
system ("printf
'module_directory:=$src_path_win/external/$dir/\ninclude
\$(module_directory)/../../solenv/gbuild/partial_build.mk\n' >
external/$dir/Makefile");
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
