fix helper "REWRITE_LIBTOOL"

diff --git a/make/environment.mk b/make/environment.mk
index 7df2f451dbec3ecd66ae895018f8b62d4effc6b7..2967219c48854b47f9e5cbee5aee8723dad3a442 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -175,9 +175,13 @@ CA_BUNDLE             = ca-certificates.crt
 CA_BUNDLE_DIR         = etc/ssl/certs
 
 # helper-"functions":
-REWRITE_LIBTOOL    = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
-REWRITE_LIBTOOLDEP = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
+REWRITE_LIBTOOL_RULES  = sed -i \
+                               -e "s,^libdir=.*,libdir='$(TARGETLIB)'," \
+                               -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g"
+
+REWRITE_LIBTOOL    = $(REWRITE_LIBTOOL_RULES) $(TARGETLIB)
 REWRITE_PKGCONF    = sed -i "s,^prefix=.*,prefix='$(TARGETPREFIX)',"
+
 # unpack tarballs, clean up
 UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE)
 REMOVE = rm -rf $(BUILD_TMP)/.remove $(TARGETPREFIX)/.remove $(BUILD_TMP)

diff --git a/make/libraries.mk b/make/libraries.mk
index 7dfb376a7a41001518bd823e7a6a17c38c38d536..cb402ab1805350b28cff193dfd68d73e6f673dd9 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -780,9 +780,6 @@ $(D)/libvorbis: $(D)/libogg $(ARCHIVE)/libvorbis-$(LIBVORBIS_VER).tar.xz | $(TAR
        $(REWRITE_LIBTOOL)/libvorbis.la
        $(REWRITE_LIBTOOL)/libvorbisenc.la
        $(REWRITE_LIBTOOL)/libvorbisfile.la
-       $(REWRITE_LIBTOOLDEP)/libvorbis.la
-       $(REWRITE_LIBTOOLDEP)/libvorbisenc.la
-       $(REWRITE_LIBTOOLDEP)/libvorbisfile.la
        $(REMOVE)/libvorbis-$(LIBVORBIS_VER)
        $(TOUCH)
 
@@ -1251,11 +1248,6 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2
        $(REWRITE_LIBTOOL)/libgio-2.0.la
        $(REWRITE_LIBTOOL)/libgobject-2.0.la
        $(REWRITE_LIBTOOL)/libgthread-2.0.la
-       $(REWRITE_LIBTOOLDEP)/libglib-2.0.la
-       $(REWRITE_LIBTOOLDEP)/libgmodule-2.0.la
-       $(REWRITE_LIBTOOLDEP)/libgio-2.0.la
-       $(REWRITE_LIBTOOLDEP)/libgobject-2.0.la
-       $(REWRITE_LIBTOOLDEP)/libgthread-2.0.la
        rm -rf $(TARGETLIB)/libgio* $(TARGETLIB)/libgmodule* $(TARGETLIB)/libgobject* $(TARGETLIB)/libgthread*
        $(REMOVE)/glib-$(LIBGLIB2_VER)
        $(TOUCH)