bgpq3: Honor DESTDIR and CPPFLAGS

4 files changed, 43 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1ac4a1bb2cc..a3f1a130c4a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
-# Generated by mksrcinfo v8
-# Mon Dec  3 17:57:17 UTC 2018
 pkgbase = bgpq3
 	pkgdesc = bgp filtering automation for Cisco and Juniper routers
 	pkgver = 0.1.35
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/snar/bgpq3
 	arch = x86_64
 	license = BSD
 	depends = glibc
 	source = bgpq3-0.1.35.tar.gz::https://github.com/snar/bgpq3/archive/v0.1.35.tar.gz
-	source = bgpq3_man_install.patch
+	source = bgpq3_install_destdir_cppflags.patch
 	sha512sums = a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
-	sha512sums = 70abefa578c24f31aef6bedce19f427760fbb0c90fca09bcea977291b65b93f0d6b153aebbf9ea549b338f2c52902c5e5cf055124229be7d0745c7a37b268526
+	sha512sums = de8089c3d11cc7bdaee692275eb6e9cba3091ebfb8f4db63a735f576ede0ade15cd99635c50d0f083a3ad390fe98ec7ba20f6436acaee9d9090cfffd36b7dc74
 
 pkgname = bgpq3
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ff324edc690..aeedbf79492a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Remi Gacogne <rgacogne at archlinux dot org>
 pkgname=bgpq3
 pkgver=0.1.35
-pkgrel=1
+pkgrel=2
 pkgdesc="bgp filtering automation for Cisco and Juniper routers"
 arch=('x86_64')
 url="https://github.com/snar/bgpq3"
 license=('BSD')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/snar/$pkgname/archive/v$pkgver.tar.gz"
-        "bgpq3_man_install.patch")
+        "bgpq3_install_destdir_cppflags.patch")
 sha512sums=('a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01'
-            '70abefa578c24f31aef6bedce19f427760fbb0c90fca09bcea977291b65b93f0d6b153aebbf9ea549b338f2c52902c5e5cf055124229be7d0745c7a37b268526')
+            'de8089c3d11cc7bdaee692275eb6e9cba3091ebfb8f4db63a735f576ede0ade15cd99635c50d0f083a3ad390fe98ec7ba20f6436acaee9d9090cfffd36b7dc74')
 depends=('glibc')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -p1 -i "$srcdir/bgpq3_man_install.patch"
+  patch -p1 -i "$srcdir/bgpq3_install_destdir_cppflags.patch"
 }
 
 build() {
diff --git a/bgpq3_install_destdir_cppflags.patch b/bgpq3_install_destdir_cppflags.patch
new file mode 100644
index 000000000000..a290e2321237
--- /dev/null
+++ b/bgpq3_install_destdir_cppflags.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile.in b/Makefile.in
+index c66c309..490dc13 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,5 +1,5 @@
+ CC=@CC@
+-CFLAGS=@CFLAGS@ @DEFS@ -g -Wall -I. -O0
++CFLAGS=@CFLAGS@ @DEFS@ -Wall -I.
+ LDADD=@LDFLAGS@ @LIBS@
+ INSTALL=@INSTALL@
+ 
+@@ -20,20 +20,18 @@ SRCS=bgpq3.c sx_report.c bgpq_expander.c sx_slentry.c bgpq3_printer.c \
+ all: bgpq3
+ 
+ bgpq3: ${OBJECTS}
+-	${CC} ${CFLAGS} -o bgpq3 ${OBJECTS} ${LDADD}
++	${CC} ${CFLAGS} ${CPPFLAGS} -o bgpq3 ${OBJECTS} ${LDADD}
+ 
+ .c.o: 
+-	${CC} ${CFLAGS} -c $<
++	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
+ 
+ clean: 
+ 	rm -rf Makefile autom4te.cache bgpq3 config.h config.log config.status
+ 	rm -rf *.o *.core core.* core
+ 
+ install: bgpq3
+-	if test ! -d @bindir@ ; then mkdir -p @bindir@ ; fi
+-	${INSTALL} -c -s -m 755 bgpq3 @bindir@
+-	if test ! -d @mandir@/man8 ; then mkdir -p @mandir@/man8 ; fi
+-	${INSTALL} -m 644 bgpq3.8 @mandir@/man8
++	${INSTALL} -D -c -s -m 755 bgpq3 ${DESTDIR}@bindir@/bgpq3/bgpq3
++	${INSTALL} -D -m 644 bgpq3.8 ${DESTDIR}@mandir@/man8/bgpq3.8
+ 
+ depend: 
+ 	makedepend -- $(CFLAGS) -- $(SRCS)
diff --git a/bgpq3_man_install.patch b/bgpq3_man_install.patch
deleted file mode 100644
index d6c6b9b4a3f4..000000000000
--- a/bgpq3_man_install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur bgpq3-0.1.29.pristine/Makefile.in bgpq3-0.1.29.new/Makefile.in
---- bgpq3-0.1.29.pristine/Makefile.in	2015-05-04 13:30:06.000000000 +0200
-+++ bgpq3-0.1.29.new/Makefile.in	2015-06-14 16:34:00.317278051 +0200
-@@ -31,8 +31,8 @@
- 
- install: bgpq3
- 	${INSTALL} -c -s -m 755 bgpq3 @bindir@
--	if test ! -d @prefix@/man/man8 ; then mkdir -p @prefix@/man/man8 ; fi
--	${INSTALL} -m 644 bgpq3.8 @prefix@/man/man8
-+	if test ! -d @mandir@/man8 ; then mkdir -p @mandir@/man8 ; fi
-+	${INSTALL} -m 644 bgpq3.8 @mandir@/man8
- 
- depend: 
- 	makedepend -- $(CFLAGS) -- $(SRCS)