| 1 |
jer 10/04/09 04:52:09 |
| 2 |
|
| 3 |
Added: tcpsound-0.3.1-makefile.patch |
| 4 |
Removed: tcpsound-0.3.1-asneeded.patch |
| 5 |
Log: |
| 6 |
Clean up ebuild. Remove all "mktool" use. Respect LDFLAGS. Incidentally fix useless compiler flags. Make (failing) Makefile commands explicit. Finish building or die (bug #313661). |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/tcpsound/files/tcpsound-0.3.1-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: tcpsound-0.3.1-makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.org 2005-09-05 09:26:34.000000000 +0200 |
| 18 |
+++ Makefile 2010-04-09 06:42:41.000000000 +0200 |
| 19 |
@@ -1,32 +1,35 @@ |
| 20 |
# Makefile for tcpsound |
| 21 |
|
| 22 |
-prefix = /usr/local |
| 23 |
+prefix = $(DESTDIR)/usr |
| 24 |
|
| 25 |
bindir = $(prefix)/bin |
| 26 |
-wavdir = $(prefix)/share/sounds |
| 27 |
+wavdir = $(prefix)/share/tcpsound |
| 28 |
includedir = $(prefix)/include |
| 29 |
libdir = $(prefix)/lib |
| 30 |
-mandir = $(prefix)/man |
| 31 |
+mandir = $(prefix)/man/man1 |
| 32 |
MAN = tcpsound.1 |
| 33 |
MANGZ = $(MAN:.1=.1.gz) |
| 34 |
-MKTOOL = ./mktool |
| 35 |
-CFLAGS = -c -v -g -W1 -I$(includedir) -L$(libdir) -lSDL -lmba -lpthread |
| 36 |
-CC = $(MKTOOL) |
| 37 |
+MKTOOL = install |
| 38 |
+CFLAGS += -I$(includedir) |
| 39 |
+LIBS = -L$(libdir) -lSDL -lmba -lpthread |
| 40 |
|
| 41 |
.SUFFIXES: .1 .1.gz |
| 42 |
|
| 43 |
-tcpsound: mktool src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c |
| 44 |
- @$(CC) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound |
| 45 |
-play: mktool src/play.c |
| 46 |
- @$(CC) $(CFLAGS) src/play.c -o play |
| 47 |
+tcpsound: src/tcpsound.c src/sound.h src/sound.c src/parse.h src/parse.c |
| 48 |
+ $(CC) $(LDFLAGS) $(CFLAGS) src/sound.c src/parse.c src/tcpsound.c -o tcpsound $(LIBS) |
| 49 |
+play: src/play.c |
| 50 |
+ $(CC) $(LDFLAGS) $(CFLAGS) src/play.c -o play $(LIBS) |
| 51 |
|
| 52 |
mktool: |
| 53 |
cc -g -o mktool mktool.c |
| 54 |
|
| 55 |
-install: mktool |
| 56 |
- $(MKTOOL) -i -m 0755 tcpsound $(bindir) |
| 57 |
- $(MKTOOL) -i wavs/*.wav $(wavdir) |
| 58 |
- -$(MKTOOL) -i docs/man/*.1.gz $(mandir)/man1 |
| 59 |
+install: tcpsound |
| 60 |
+ $(MKTOOL) -d $(bindir) |
| 61 |
+ $(MKTOOL) -d $(wavdir) |
| 62 |
+ $(MKTOOL) -d $(mandir) |
| 63 |
+ $(MKTOOL) -m 0755 tcpsound $(bindir) |
| 64 |
+ $(MKTOOL) -m 0644 wavs/*.wav $(wavdir) |
| 65 |
+ -$(MKTOOL) -m 0644 docs/man/tcpsound.1.gz $(mandir) |
| 66 |
@echo |
| 67 |
@echo installation successful |
| 68 |
uninstall: mktool |
Archives