mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Updated libebml patch to support DESTDIR
This commit is contained in:
@@ -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 <support/SupportDefs.h>
|
||||
#else // anything else (Linux, BSD, ...)
|
||||
# include <inttypes.h>
|
||||
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),)
|
||||
|
||||
Reference in New Issue
Block a user