libs: g-ir-scanner: do not hardcode libtool path
authorAntoine Jacoutot <ajacoutot@gnome.org>
Wed, 9 Apr 2014 14:44:07 +0000 (16:44 +0200)
committerTim-Philipp Müller <tim@centricular.com>
Thu, 17 Apr 2014 08:26:20 +0000 (09:26 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=726571

gst/Makefile.am
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/net/Makefile.am

index 2f69db1..7bf1860 100644 (file)
@@ -298,7 +298,7 @@ Gst-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_API_VERSIO
                --include=GLib-2.0 \
                --include=GObject-2.0 \
                --include=GModule-2.0 \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg glib-2.0 \
                --pkg gobject-2.0 \
                --pkg gmodule-no-export-2.0 \
index 076dc02..650b97f 100644 (file)
@@ -89,7 +89,7 @@ GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERS
                --library-path=$(top_builddir)/gst \
                --library=libgstbase-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg-export gstreamer-base-@GST_API_VERSION@ \
                --add-init-section="gst_init(NULL,NULL);" \
index 9ad74d5..1389270 100644 (file)
@@ -154,7 +154,7 @@ GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VE
                --library-path=$(top_builddir)/gst \
                --library=libgstcheck-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg-export gstreamer-check-@GST_API_VERSION@ \
                --add-init-section="gst_init(NULL,NULL);" \
index 3ae4098..4050f27 100644 (file)
@@ -63,7 +63,7 @@ GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@
                --library-path=$(top_builddir)/gst \
                --library=libgstcontroller-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg-export gstreamer-controller-@GST_API_VERSION@ \
                --add-init-section="gst_init(NULL,NULL);" \
index dbd342b..f022b92 100644 (file)
@@ -63,7 +63,7 @@ GstNet-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_API_VERSIO
                --library=libgstnet-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=Gio-2.0 \
-               --libtool="$(top_builddir)/libtool" \
+               --libtool="${LIBTOOL}" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg gio-2.0 \
                --pkg-export="gstreamer-net-@GST_API_VERSION@" \