mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 07:10:05 +02:00
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h
|
|
--- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000
|
|
+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000
|
|
@@ -72,7 +72,7 @@
|
|
typedef uint16_t uint16;
|
|
typedef uint8_t uint8;
|
|
# endif // __GNUC__
|
|
-#elif defined(__BEOS__)
|
|
+#elif defined(__BEOS__) || defined(__HAIKU__)
|
|
#include <SupportDefs.h>
|
|
#elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */
|
|
typedef signed long long int64;
|
|
@@ -98,7 +98,7 @@
|
|
typedef uint32_t uint32;
|
|
typedef uint16_t uint16;
|
|
typedef uint8_t uint8;
|
|
-#elif defined(__BEOS__)
|
|
+#elif defined(__BEOS__) || defined (__HAIKU__)
|
|
# 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-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))
|
|
prefix=/boot/home/config
|
|
+# Haiku wants the libs and headers in /boot/common
|
|
+else ifeq (Haiku,$(shell uname -s))
|
|
+prefix=/boot/common
|
|
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),)
|