[Libreoffice-commits] .: autogen.sh

Radek Doulík rodo at kemper.freedesktop.org
Thu May 17 02:08:42 PDT 2012


 autogen.sh |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit cbe733f19aef7546fd8b78a9ef92e6c8d0867f59
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Fri May 11 22:20:18 2012 +0400

    autogen.sh: append aclocal arguments to ACLOCAL_FLAGS unconditionally
    
    Change-Id: I2254628edfe213c3424dce2bc5d9f164752e913c

diff --git a/autogen.sh b/autogen.sh
index 6f99712..67d462c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -144,11 +144,8 @@ $ENV{PWD} = $cwd_str;
 
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
-if ($aclocal_flags eq "")
-{
-    $aclocal_flags = "-I ./m4";
-    $aclocal_flags .= " -I ./m4/mac" if ($system eq 'Darwin');
-}
+$aclocal_flags .= " -I ./m4";
+$aclocal_flags .= " -I ./m4/mac" if ($system eq 'Darwin');
 
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
 


More information about the Libreoffice-commits mailing list