SOURCES: libebml-makefile.patch - updated for 0.7.5

qboosh qboosh at pld-linux.org
Sun Jun 12 21:15:54 CEST 2005


Author: qboosh                       Date: Sun Jun 12 19:15:54 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.7.5

---- Files affected:
SOURCES:
   libebml-makefile.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/libebml-makefile.patch
diff -u SOURCES/libebml-makefile.patch:1.7 SOURCES/libebml-makefile.patch:1.8
--- SOURCES/libebml-makefile.patch:1.7	Sun Apr 24 00:58:58 2005
+++ SOURCES/libebml-makefile.patch	Sun Jun 12 21:15:48 2005
@@ -1,5 +1,5 @@
---- libebml-0.7.4/make/linux/Makefile.orig	2005-04-16 13:19:57.000000000 +0200
-+++ libebml-0.7.4/make/linux/Makefile	2005-04-24 01:00:00.947584792 +0200
+--- libebml-0.7.5/make/linux/Makefile.orig	2005-04-19 08:56:06.000000000 +0200
++++ libebml-0.7.5/make/linux/Makefile	2005-06-12 20:47:04.374324344 +0200
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -31,7 +31,7 @@
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
  COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-@@ -79,19 +77,11 @@
+@@ -83,19 +81,11 @@
  	@false
  
  # Build rules
@@ -53,12 +53,13 @@
  
  clean:
  	rm -f $(objects) $(objects_so)
-@@ -113,26 +103,21 @@
- 		$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
- 	done
- 
+@@ -120,26 +110,22 @@
+ ifeq (Darwin,$(shell uname -s))
+ install: install_staticlib install_headers
+ else
 -install: install_staticlib install_sharedlib install_headers
 +install: install_lib install_headers
+ endif
  
  install_headers:
 -	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
@@ -81,10 +82,9 @@
 -install_sharedlib: $(LIBRARY_SO)
 -	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
 -	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
--
 +install_lib: $(LIBRARY)
 +	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+ 
  
  ifneq ($(wildcard .depend),)
- include .depend
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libebml-makefile.patch?r1=1.7&r2=1.8&f=u




More information about the pld-cvs-commit mailing list