[gxml] Fixed GObject Introspection Mac OS X build/install



commit fdd01e1e3859e3b8603c3d03395f3b68cfb00ba1
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Aug 8 12:35:31 2015 -0500

    Fixed GObject Introspection Mac OS X build/install

 Makefile.am      |    3 ++-
 configure.ac     |    2 +-
 gxml/Makefile.am |    7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f3dd6bf..e6a9f90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,8 +86,9 @@ DISTCLEANFILES = intltool-extract \
 
 ChangeLog:
        @echo Creating $@
+       @touch ChangeLog
        @if test -d "$(srcdir)/.git"; then \
-         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $  tmp \
+         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt > $  tmp \
          && mv -f $  tmp $@ \
          || ($(RM) $  tmp; \
              echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
diff --git a/configure.ac b/configure.ac
index 2f834aa..5a0577a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 # Release Version
 m4_define([project_major_version], [0])
 m4_define([project_minor_version], [6])
-m4_define([project_micro_version], [0])
+m4_define([project_micro_version], [1])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 417cf12..e2aed20 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -188,9 +188,10 @@ if HAVE_INTROSPECTION
 # dlname:
 #   Extract our dlname like libfolks does, see bgo#658002 and bgo#585116
 #   This is what g-ir-scanner does.
-libgxml_dlname = \
-        `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml-0.6.la`
-
+libgxml_dlname=\
+       `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgxml-0.6.la`
+#libgxml_dlname=\
+#      `$(GREP) -e dlname libgxml-0.6.la | $(SED) s/dlname=\'// | $(SED) s/\'//`
 
 AM_VALAFLAGS += \
        --gir=GXml-$(API_VERSION).gir


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