| 1 |
radhermit 11/02/07 11:08:05 |
| 2 |
|
| 3 |
Added: csfml-1.6-destdir.patch |
| 4 |
Log: |
| 5 |
Initial import. Split from media-libs/libsfml. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/csfml/files/csfml-1.6-destdir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/csfml/files/csfml-1.6-destdir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/csfml/files/csfml-1.6-destdir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: csfml-1.6-destdir.patch |
| 16 |
=================================================================== |
| 17 |
--- SFML-1.6.orig/CSFML/src/SFML/Audio/Makefile |
| 18 |
+++ SFML-1.6/CSFML/src/SFML/Audio/Makefile |
| 19 |
@@ -20,4 +20,4 @@ |
| 20 |
@rm -rf $(LIBNAME) |
| 21 |
|
| 22 |
install: |
| 23 |
- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) |
| 24 |
+ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)) |
| 25 |
--- SFML-1.6.orig/CSFML/src/SFML/Graphics/Makefile |
| 26 |
+++ SFML-1.6/CSFML/src/SFML/Graphics/Makefile |
| 27 |
@@ -20,4 +20,4 @@ |
| 28 |
@rm -rf $(LIBNAME) |
| 29 |
|
| 30 |
install: |
| 31 |
- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) |
| 32 |
+ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)) |
| 33 |
--- SFML-1.6.orig/CSFML/src/SFML/Makefile |
| 34 |
+++ SFML-1.6/CSFML/src/SFML/Makefile |
| 35 |
@@ -1,15 +1,18 @@ |
| 36 |
export CC = gcc |
| 37 |
export CPP = g++ |
| 38 |
-export CFLAGS = -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS -O2 |
| 39 |
-export LDFLAGS = -shared |
| 40 |
+export CFLAGS += -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS |
| 41 |
+export LDFLAGS += -shared |
| 42 |
export LIBPATH = ../../../lib |
| 43 |
export VERSION = 1.6 |
| 44 |
export CP = cp |
| 45 |
export LN = ln |
| 46 |
export LNFLAGS = -s -f |
| 47 |
-export DESTDIR = /usr/local |
| 48 |
-export DESTLIBDIR = $(DESTDIR)/lib |
| 49 |
-export DESTINCDIR = $(DESTDIR)/include |
| 50 |
+export DESTDIR = |
| 51 |
+ifeq ($(origin prefix), undefined) |
| 52 |
+ export prefix = /usr/local |
| 53 |
+endif |
| 54 |
+export libdir = $(prefix)/lib |
| 55 |
+export includedir = $(prefix)/include |
| 56 |
|
| 57 |
all: csfml-system csfml-window csfml-network csfml-graphics csfml-audio |
| 58 |
|
| 59 |
@@ -42,6 +45,6 @@ |
| 60 |
@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@) |
| 61 |
|
| 62 |
install: |
| 63 |
- @(mkdir -p $(DESTLIBDIR)) |
| 64 |
- @(mkdir -p $(DESTINCDIR)) |
| 65 |
- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)) |
| 66 |
+ @(mkdir -p $(DESTDIR)/$(libdir)) |
| 67 |
+ @(mkdir -p $(DESTDIR)/$(includedir)) |
| 68 |
+ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir)) |
| 69 |
--- SFML-1.6.orig/CSFML/src/SFML/Network/Makefile |
| 70 |
+++ SFML-1.6/CSFML/src/SFML/Network/Makefile |
| 71 |
@@ -20,4 +20,4 @@ |
| 72 |
@rm -rf $(LIBNAME) |
| 73 |
|
| 74 |
install: |
| 75 |
- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) |
| 76 |
+ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)) |
| 77 |
--- SFML-1.6.orig/CSFML/src/SFML/System/Makefile |
| 78 |
+++ SFML-1.6/CSFML/src/SFML/System/Makefile |
| 79 |
@@ -20,4 +20,4 @@ |
| 80 |
@rm -rf $(LIBNAME) |
| 81 |
|
| 82 |
install: |
| 83 |
- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) |
| 84 |
+ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)) |
| 85 |
--- SFML-1.6.orig/CSFML/src/SFML/Window/Makefile |
| 86 |
+++ SFML-1.6/CSFML/src/SFML/Window/Makefile |
| 87 |
@@ -20,4 +20,4 @@ |
| 88 |
@rm -rf $(LIBNAME) |
| 89 |
|
| 90 |
install: |
| 91 |
- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) |
| 92 |
+ @($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)) |
Archives