[chronojump] Revert "Fixes a problem when executing initltool-merge -m in po/ directory."



commit 5b1eb806007dd499d8bde42e7b973e16bd961080
Author: Carles Pina i Estany <carles pina cat>
Date:   Tue Nov 22 00:18:02 2016 +0100

    Revert "Fixes a problem when executing initltool-merge -m in po/ directory."
    
    This reverts commit b4d33d9ee56d97aa39cd67355dacdfdaa7bf7d0a.
    
    It reverts this commit because this change is causing problem building
    chronojump on OSX. I temporary disable this change (next commit will
    have a workaround for the intltool-merge) since we need to build on OSX
    as well.

 configure.ac |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 03644b4..1a93fda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,7 @@ AC_PREREQ([2.54])
 
 # PACKAGE_VERSION variable comes from here (e.g. to show it to the user,
 # distribution package names, etc.)
-
-# We are not using m4_esyscmd_s (then we wouldn't need the echo -n ``) because
-# of a bug in intltool-update. See: https://bugs.launchpad.net/intltool/+bug/1642931
-AC_INIT([chronojump], [m4_esyscmd([echo -n `git describe`])])
+AC_INIT([chronojump], [m4_esyscmd_s([git describe])])
 
 # This is used in AssemblyInfo.cs.in: it can only be major.minor.release format
 AC_SUBST([PACKAGE_SIMPLIFIED_VERSION], [m4_esyscmd_s([git describe --abbrev=0])])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]