From e2533c86d95025f99f2ea454f559428c567bbb07 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 22 Sep 2010 20:06:00 +0000 Subject: [PATCH] Updated libebml patch to support DESTDIR --- dev-libs/libebml/patches/libebml-1.0.0.patch | 39 ++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch index b3cdc295d..034937173 100644 --- a/dev-libs/libebml/patches/libebml-1.0.0.patch +++ b/dev-libs/libebml/patches/libebml-1.0.0.patch @@ -19,9 +19,9 @@ diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t. # include #else // anything else (Linux, BSD, ...) # include -diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-haiku/make/linux/Makefile ---- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.013107200 +0000 -+++ libebml-1.0.0-haiku/make/linux/Makefile 2010-06-30 15:56:44.801374208 +0000 +diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile +--- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000 ++++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000 @@ -13,6 +13,9 @@ # BeOS wants the libs and headers in /boot/home/config ifeq (BeOS,$(shell uname -s)) @@ -32,3 +32,36 @@ diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-haiku/make/linux/Makef else prefix=/usr/local endif +@@ -122,23 +125,23 @@ + endif + + install_headers: +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) + for i in $(INCLUDE_DIR)/*.h; do \ +- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ ++ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ + done +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c + for i in $(INCLUDE_DIR)/c/*.h; do \ +- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ ++ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ + done + + install_staticlib: $(LIBRARY) +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) +- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) ++ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) + + install_sharedlib: $(LIBRARY_SO) +- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) +- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) +- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) ++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) ++ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) ++ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) + + + ifneq ($(wildcard .depend),)