Respect ${PKGMANDIR}
This commit is contained in:
parent
e44e7000cd
commit
40f7f8145c
3 changed files with 24 additions and 10 deletions
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.4 2012/12/25 09:34:41 ryoon Exp $
|
||||
$NetBSD: distinfo,v 1.5 2013/03/26 08:17:22 sbd Exp $
|
||||
|
||||
SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
|
||||
RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
|
||||
Size (rtmpdump-2.4.tar.gz) = 134558 bytes
|
||||
SHA1 (patch-Makefile) = d5a0af3068d95c609de5ff08bc5431e13b1d051a
|
||||
SHA1 (patch-librtmp_Makefile) = cc20d2cd853734f719b085e74767543c5b36af69
|
||||
SHA1 (patch-Makefile) = db528f2b97bf7f4500cce26c34e5b3929019fd9a
|
||||
SHA1 (patch-librtmp_Makefile) = 23fea1ed2b7cd5be7406687c6c4cc34b40de5de5
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: patch-Makefile,v 1.3 2012/12/24 14:29:24 ryoon Exp $
|
||||
$NetBSD: patch-Makefile,v 1.4 2013/03/26 08:17:22 sbd Exp $
|
||||
|
||||
* Pass LDFLAGS to linker
|
||||
* Libtoolize
|
||||
|
||||
--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -22,7 +22,7 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
|
||||
@@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
|
||||
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
|
||||
OPT=-O2
|
||||
CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
|
||||
|
@ -14,6 +14,11 @@ $NetBSD: patch-Makefile,v 1.3 2012/12/24 14:29:24 ryoon Exp $
|
|||
|
||||
bindir=$(prefix)/bin
|
||||
sbindir=$(prefix)/sbin
|
||||
-mandir=$(prefix)/man
|
||||
+mandir=$(prefix)/${PKGMANDIR}
|
||||
|
||||
BINDIR=$(DESTDIR)$(bindir)
|
||||
SBINDIR=$(DESTDIR)$(sbindir)
|
||||
@@ -44,7 +44,7 @@ THREADLIB_mingw=
|
||||
THREADLIB=$(THREADLIB_$(SYS))
|
||||
SLIBS=$(THREADLIB) $(LIBS)
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
$NetBSD: patch-librtmp_Makefile,v 1.2 2011/10/08 06:09:34 dsainty Exp $
|
||||
$NetBSD: patch-librtmp_Makefile,v 1.3 2013/03/26 08:17:22 sbd Exp $
|
||||
|
||||
Libtoolize
|
||||
|
||||
--- librtmp/Makefile 2011-07-12 12:24:33.000000000 +1200
|
||||
+++ librtmp/Makefile 2011-10-08 17:59:54.713362187 +1300
|
||||
@@ -73,23 +73,35 @@
|
||||
--- librtmp/Makefile.orig 2011-07-12 00:24:33.000000000 +0000
|
||||
+++ librtmp/Makefile
|
||||
@@ -5,7 +5,7 @@ prefix=/usr/local
|
||||
incdir=$(prefix)/include/librtmp
|
||||
bindir=$(prefix)/bin
|
||||
libdir=$(prefix)/lib
|
||||
-mandir=$(prefix)/man
|
||||
+mandir=$(prefix)/${PKGMANDIR}
|
||||
BINDIR=$(DESTDIR)$(bindir)
|
||||
INCDIR=$(DESTDIR)$(incdir)
|
||||
LIBDIR=$(DESTDIR)$(libdir)
|
||||
@@ -73,23 +73,35 @@ LDFLAGS=$(XLDFLAGS)
|
||||
|
||||
OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
|
||||
|
||||
|
@ -44,7 +53,7 @@ Libtoolize
|
|||
|
||||
librtmp.pc: librtmp.pc.in Makefile
|
||||
sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
|
||||
@@ -97,12 +109,12 @@
|
||||
@@ -97,12 +109,12 @@ librtmp.pc: librtmp.pc.in Makefile
|
||||
-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
|
||||
-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
|
||||
|
||||
|
|
Loading…
Reference in a new issue