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

Henry Castro (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 21 14:28:36 UTC 2020


 configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 53a27a1ec4543afdf098ca14caa1c67a1544bce6
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sun Apr 19 16:25:37 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Apr 21 16:28:13 2020 +0200

    android: set specific DEST:SOURCE config files
    
    The *.in files in android should be generated
    explicitly in source dir. With this setting it is
    enabled to configure builddir != srcdir
    
    Change-Id: I529f8021d4407b2f87ae265b93fb3d764bb1a1bf
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92595
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/configure.ac b/configure.ac
index 939f407e8..013a2c492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1081,10 +1081,10 @@ fi
 
 if test "$enable_androidapp" = "yes"; then
     AC_CONFIG_FILES([android/Makefile
-                 android/build.gradle
-                 android/app/appSettings.gradle
-                 android/lib/libSettings.gradle
-                 android/lib/src/main/cpp/CMakeLists.txt])
+                 $srcdir/android/build.gradle:android/build.gradle.in
+                 $srcdir/android/app/appSettings.gradle:android/app/appSettings.gradle.in
+                 $srcdir/android/lib/libSettings.gradle:android/lib/libSettings.gradle.in
+                 $srcdir/android/lib/src/main/cpp/CMakeLists.txt:android/lib/src/main/cpp/CMakeLists.txt.in])
 fi
 
 AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])


More information about the Libreoffice-commits mailing list