| 1 |
ssuominen 09/05/12 11:08:48 |
| 2 |
|
| 3 |
Added: libkarma-0.1.0-destdir.patch |
| 4 |
Log: |
| 5 |
Fix pkgconfig file wrt #245539 by using DESTDIR as it should. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/libkarma/files/libkarma-0.1.0-destdir.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libkarma/files/libkarma-0.1.0-destdir.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libkarma/files/libkarma-0.1.0-destdir.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libkarma-0.1.0-destdir.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur libkarma-0.1.0.orig/karma-sharp/Makefile libkarma-0.1.0/karma-sharp/Makefile |
| 17 |
--- libkarma-0.1.0.orig/karma-sharp/Makefile 2007-05-15 19:29:02.000000000 +0300 |
| 18 |
+++ libkarma-0.1.0/karma-sharp/Makefile 2009-05-12 13:58:55.000000000 +0300 |
| 19 |
@@ -26,18 +26,18 @@ |
| 20 |
|
| 21 |
ifdef HAS_MONO |
| 22 |
install: $(ASSEMBLY) karma-sharp.pc |
| 23 |
- ../install-sh -d $(DEST)/lib/karma-sharp |
| 24 |
- ../install-sh -d $(DEST)/lib/pkgconfig |
| 25 |
- ../install-sh -t $(DEST)/lib/karma-sharp $(ASSEMBLY) |
| 26 |
- ../install-sh -t $(DEST)/lib/pkgconfig -m 0644 karma-sharp.pc |
| 27 |
+ ../install-sh -d $(DESTDIR)$(PREFIX)/lib/karma-sharp |
| 28 |
+ ../install-sh -d $(DESTDIR)$(PREFIX)/lib/pkgconfig |
| 29 |
+ ../install-sh -t $(DESTDIR)$(PREFIX)/lib/karma-sharp $(ASSEMBLY) |
| 30 |
+ ../install-sh -t $(DESTDIR)$(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc |
| 31 |
else |
| 32 |
install: |
| 33 |
|
| 34 |
endif |
| 35 |
|
| 36 |
uninstall: FORCE |
| 37 |
- $(RM) -r $(DEST)/lib/karma-sharp |
| 38 |
- $(RM) $(DEST)/lib/pkgconfig/karma-sharp.pc |
| 39 |
+ $(RM) -r $(PREFIX)/lib/karma-sharp |
| 40 |
+ $(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc |
| 41 |
|
| 42 |
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES) |
| 43 |
$(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix |
| 44 |
diff -ur libkarma-0.1.0.orig/Makefile libkarma-0.1.0/Makefile |
| 45 |
--- libkarma-0.1.0.orig/Makefile 2007-05-15 19:29:02.000000000 +0300 |
| 46 |
+++ libkarma-0.1.0/Makefile 2009-05-12 13:57:16.000000000 +0300 |
| 47 |
@@ -1,14 +1,12 @@ |
| 48 |
LK_SRC=src |
| 49 |
TOOLSDIR=tools |
| 50 |
-PREFIX=/usr/local |
| 51 |
+PREFIX=/usr |
| 52 |
INSTALL?=./install-sh |
| 53 |
VERSION=0.1.0 |
| 54 |
-DEST=$(PREFIX) |
| 55 |
SHELL=/bin/bash |
| 56 |
|
| 57 |
export PREFIX |
| 58 |
export VERSION |
| 59 |
-export DEST |
| 60 |
|
| 61 |
DISTNAME=libkarma-$(VERSION) |
| 62 |
DISTFILES= $(LK_SRC)/{Jamfile,Makefile,*[ch]} \ |
| 63 |
@@ -16,11 +14,10 @@ |
| 64 |
karma-sharp/{Makefile,karma-sharp.pc.in,Song.cs,Device.cs} \ |
| 65 |
Jamfile Makefile COPYING ChangeLog THANKS INSTALL* TODO \ |
| 66 |
install-sh karma-tools.spec |
| 67 |
-DOCS=THANKS TODO ChangeLog |
| 68 |
|
| 69 |
INSTALL_DIR := $(INSTALL) -d -o root -g root -m 0755 |
| 70 |
INSTALL_FILE := $(INSTALL) -o root -g root -m 0644 |
| 71 |
-INSTALL_PROGRAM := $(INSTALL) -o root -g root -m 0755 # -s |
| 72 |
+INSTALL_PROGRAM := $(INSTALL) -o root -g root -m 0755 |
| 73 |
INSTALL_SCRIPT := $(INSTALL) -o root -g root -m 0755 |
| 74 |
|
| 75 |
all: libkarma tools karma-sharp |
| 76 |
@@ -31,14 +28,11 @@ |
| 77 |
cd $(LK_SRC) && $(MAKE) install |
| 78 |
cd karma-sharp && $(MAKE) install |
| 79 |
cd tools && $(MAKE) install |
| 80 |
- $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/doc/libkarma |
| 81 |
- $(INSTALL_FILE) $(DOCS) $(DESTDIR)$(PREFIX)/share/doc/libkarma |
| 82 |
|
| 83 |
uninstall: |
| 84 |
cd $(LK_SRC) && $(MAKE) uninstall |
| 85 |
cd karma-sharp && $(MAKE) uninstall |
| 86 |
cd tools && $(MAKE) uninstall |
| 87 |
- rm -rf $(DESTDIR)$(PREFIX)/share/doc/libkarma |
| 88 |
|
| 89 |
libkarma: FORCE |
| 90 |
cd $(LK_SRC) && $(MAKE) |
| 91 |
diff -ur libkarma-0.1.0.orig/src/Makefile libkarma-0.1.0/src/Makefile |
| 92 |
--- libkarma-0.1.0.orig/src/Makefile 2007-05-15 19:29:02.000000000 +0300 |
| 93 |
+++ libkarma-0.1.0/src/Makefile 2009-05-12 14:06:24.000000000 +0300 |
| 94 |
@@ -14,7 +14,7 @@ |
| 95 |
LN_S?=ln -s |
| 96 |
|
| 97 |
CFLAGS+=-fPIC -D_REENTRANT -Wall -pedantic |
| 98 |
-CFLAGS+=-ggdb -W -Wchar-subscripts -Wmissing-prototypes |
| 99 |
+CFLAGS+=-W -Wchar-subscripts -Wmissing-prototypes |
| 100 |
CFLAGS+=-Wmissing-declarations -Wno-switch -Wredundant-decls -Wno-unused |
| 101 |
|
| 102 |
MAJOR?=$(shell VERSION=${VERSION} echo $${VERSION%%\.*}) |
| 103 |
@@ -37,20 +37,20 @@ |
| 104 |
default: all |
| 105 |
|
| 106 |
install: shared-lib-stamp static-lib-stamp |
| 107 |
- ../install-sh -m 0755 -d $(DEST)/lib |
| 108 |
- ../install-sh -m 0755 -d $(DEST)/include |
| 109 |
- ../install-sh -m 0755 -d $(DEST)/include/libkarma |
| 110 |
- ../install-sh -m 0644 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).a |
| 111 |
- ../install-sh -m 0755 -t $(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION) |
| 112 |
- $(RM) $(PREFIX)/lib/$(OUT_MAJOR) |
| 113 |
- $(RM) $(PREFIX)/lib/$(OUT_BASE) |
| 114 |
- $(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_MAJOR) |
| 115 |
- $(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_BASE) |
| 116 |
- ../install-sh -m 0644 -t $(DEST)/include/libkarma/ $(INST_HEADERS) |
| 117 |
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/lib |
| 118 |
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include |
| 119 |
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include/libkarma |
| 120 |
+ ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a |
| 121 |
+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION) |
| 122 |
+ $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR) |
| 123 |
+ $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE) |
| 124 |
+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR) |
| 125 |
+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE) |
| 126 |
+ ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/include/libkarma/ $(INST_HEADERS) |
| 127 |
|
| 128 |
uninstall: |
| 129 |
$(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(OUT_MAJOR) $(PREFIX)/lib/$(OUT_BASE) $(PREFIX)/lib/$(OUT_VERSION) |
| 130 |
- $(RM) -r $(DEST)/include/libkarma |
| 131 |
+ $(RM) -r $(PREFIX)/include/libkarma |
| 132 |
|
| 133 |
OBJS = $(SRCS:.c=.o) |
| 134 |
|
| 135 |
diff -ur libkarma-0.1.0.orig/tools/Makefile libkarma-0.1.0/tools/Makefile |
| 136 |
--- libkarma-0.1.0.orig/tools/Makefile 2007-05-15 19:29:02.000000000 +0300 |
| 137 |
+++ libkarma-0.1.0/tools/Makefile 2009-05-12 13:56:31.000000000 +0300 |
| 138 |
@@ -17,8 +17,8 @@ |
| 139 |
|
| 140 |
SRCS=pathedit.c |
| 141 |
|
| 142 |
-CC=gcc |
| 143 |
-CFLAGS+=-Wall -pedantic -g |
| 144 |
+CC?=gcc |
| 145 |
+CFLAGS+=-Wall -pedantic |
| 146 |
LDFLAGS+=-ltag_c -lz -L $(LIBDIR) |
| 147 |
|
| 148 |
OBJS=$(SRCS:.c=.o) |
| 149 |
@@ -43,13 +43,13 @@ |
| 150 |
$(CC) $(INCLUDES) $(CFLAGS) $@.c -o $@ -lusb |
| 151 |
|
| 152 |
install: |
| 153 |
- ../install-sh -m 0755 -d $(DEST)/bin |
| 154 |
- ../install-sh -m 0755 -t $(DEST)/bin/ $(TOOLS) |
| 155 |
- ../install-sh -m 0755 -d $(PREFIX)/share/man/man1 |
| 156 |
- ../install-sh -m 0755 -t $(PREFIX)/share/man/man1 $(MANPAGES) |
| 157 |
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/bin |
| 158 |
+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/bin/ $(TOOLS) |
| 159 |
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/share/man/man1 |
| 160 |
+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/share/man/man1 $(MANPAGES) |
| 161 |
|
| 162 |
uninstall: |
| 163 |
- cd $(DEST)/bin && $(RM) $(TOOLS) |
| 164 |
+ cd $(PREFIX)/bin && $(RM) $(TOOLS) |
| 165 |
|
| 166 |
.PHONY: clean |
Archives