[Groonga-commit] groonga/groonga at a33a6c4 [master] Fix binary operator expected.

Back to archive index

Hiroyuki Sato null+****@clear*****
Sat Sep 19 19:40:14 JST 2015


Hiroyuki Sato	2015-09-19 19:40:14 +0900 (Sat, 19 Sep 2015)

  New Revision: a33a6c45422cc25800ebab16290cba8edb8c3254
  https://github.com/groonga/groonga/commit/a33a6c45422cc25800ebab16290cba8edb8c3254

  Merged 48cc114: Merge pull request #407 from hiroyuki-sato/fix_autogen

  Message:
    Fix binary operator expected.
    
    If multiple gettext package installed,
    Following statement does not work properly.
    
    if [ -d $gettext_aclocal ]; then
      ACLOCAL_ARGS="$ACLOCAL_ARGS -I $gettext_aclocal"
    fi
    
    ./autogen.sh: line 12: [: /usr/local/Cellar/gettext/0.19.4/share/aclocal: binary operator expected
    
    echo /usr/local/Cellar/gettext/*/share/aclocal
    /usr/local/Cellar/gettext/0.19.4/share/aclocal /usr/local/Cellar/gettext/0.19.5.1/share/aclocal

  Modified files:
    autogen.sh

  Modified: autogen.sh (+3 -3)
===================================================================
--- autogen.sh    2015-09-18 17:55:53 +0900 (48a09b6)
+++ autogen.sh    2015-09-19 19:40:14 +0900 (3a64869)
@@ -8,9 +8,9 @@ Darwin)
         if [ -d $homebrew_aclocal ]; then
           ACLOCAL_ARGS="$ACLOCAL_ARGS -I $homebrew_aclocal"
         fi
-        gettext_aclocal="$(echo /usr/local/Cellar/gettext/*/share/aclocal)"
-        if [ -d $gettext_aclocal ]; then
-          ACLOCAL_ARGS="$ACLOCAL_ARGS -I $gettext_aclocal"
+        gettext_aclocal="$(echo /usr/local/Cellar/gettext/*/share/aclocal | awk '{ print $NF }')"
+        if [ -d "$gettext_aclocal" ]; then
+          $ACLOCAL_ARGS="$ACLOCAL_ARGS -I $gettext_aclocal"
         fi
 	;;
 FreeBSD)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index