--- a/patches/libebml-01-makefile.diff	Sat Oct 09 10:41:04 2010 +0000
+++ b/patches/libebml-01-makefile.diff	Sun Oct 10 19:53:49 2010 +0000
@@ -1,81 +1,30 @@
---- solaris/Makefile.orig	2007-07-13 16:19:17.958665806 +0700
-+++ solaris/Makefile	2007-07-13 16:19:43.107883802 +0700
-@@ -10,18 +10,11 @@
- #
- 
- # Paths
--# BeOS wants the libs and headers in /boot/home/config
--ifeq (BeOS,$(shell uname -s))
--prefix=/boot/home/config
--else
--prefix=/usr/local
--endif
-+prefix=$(PREFIX)
- libdir=$(prefix)/lib
- includedir=$(prefix)/include/ebml
- 
- # Programs
--CXX=g++
--LD=$(CXX)
- AR = ar rcvu
- RANLIB = ranlib
- INSTALL = install
-@@ -65,7 +58,7 @@
- objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
- 
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
--COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(INCLUDE)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
- ifeq (Darwin,$(shell uname -s))
-@@ -87,14 +80,14 @@
- 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- %.lo: %$(EXTENSION)
--	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+	$(CXX) -c $(COMPILEFLAGS) -KPIC -o $@ $<
- 
- $(LIBRARY): $(objects)
- 	$(AR) $@ $(objects)
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
-+	$(CXX) -G -h $(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
- 	rm -f $(LIBRARY_SO)
- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
- 
-@@ -125,23 +118,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 -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)/$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)/$(libdir)
-+	( cd $(DESTDIR)/$(libdir) ; ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) )
- 
- 
- ifneq ($(wildcard .depend),)
+--- libebml-1.0.0/make/linux/Makefile.orig	Fri Jun  4 04:44:54 2010
++++ libebml-1.0.0/make/linux/Makefile	Sat Oct  9 16:26:15 2010
+@@ -64,6 +64,9 @@
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
++LOFLAGS=-fPIC
++ARFLAGS=rcvu
++LIBSOFLAGS=-Wl,-soname,
+ 
+ ifeq (Darwin,$(shell uname -s))
+ all: staticlib
+@@ -84,14 +87,14 @@
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ %.lo: %$(EXTENSION)
+-	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++	$(CXX) -c $(COMPILEFLAGS) $(LOFLAGS) -o $@ $<
+ 
+ $(LIBRARY): $(objects)
+-	$(AR) rcvu $@ $(objects)
++	$(AR) $(ARFLAGS) $@ $(objects)
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
++	$(CXX) -shared $(LIBSOFLAGS)$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+ 	rm -f $(LIBRARY_SO)
+ 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+