From: reyk <reyk@openbsd.org>
Date: Fri, 22 Jul 2016 09:28:59 +0000 (+0000)
Subject: Fix generated Perl headers.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=366293ee10d198d4748199a9461c83a4cf897948;p=openbsd

Fix generated Perl headers.

With input from bluhm@
---

diff --git a/regress/usr.sbin/switchd/Makefile b/regress/usr.sbin/switchd/Makefile
index 8319910e3e2..9d9c8894d4a 100644
--- a/regress/usr.sbin/switchd/Makefile
+++ b/regress/usr.sbin/switchd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2016/07/19 17:04:19 reyk Exp $
+# $OpenBSD: Makefile,v 1.2 2016/07/22 09:28:59 reyk Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-Net-Pcap		Perl interface for libpcap
@@ -54,9 +54,9 @@ run-regress-$a: $a
 
 ${OFP_HEADERS}:
 	@-mkdir -p ${.OBJDIR}/net
-	# XXX headers can be in two different locations
-	@-test ${SRC_PATH}/$@ && cp ${SRC_PATH}/$@ ${.OBJDIR}
-	@-test ${SYS_PATH}/$@ && cp ${SYS_PATH}/$@ ${.OBJDIR}/net
+	@-for i in ${SRC_PATH}/$@ ${SYS_PATH}/$@; do \
+		test -s $$i && grep -v '^#include' $$i > ${.OBJDIR}/$@; \
+	done
 
 .SUFFIXES: .h .ph
 .h.ph: