From: Guy Harris <guy@alum.mit.edu>
Date: Tue, 3 Mar 2020 00:56:17 +0000 (-0800)
Subject: Look for Makefile-devel-adds in the top-level source directory.
X-Git-Tag: tcpdump-4.99-bp~488
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/a2c5888cf6b6541a587789ee1f88ef862afd4c1c

Look for Makefile-devel-adds in the top-level source directory.

If you're doing an out-of-tree build, that's *not* the current
directory.
---

diff --git a/configure b/configure
index c1b46405..ade0e52b 100755
--- a/configure
+++ b/configure
@@ -9124,7 +9124,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   case $ac_file$ac_mode in
     "default-1":C) if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $ac_top_srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi ;;
 
diff --git a/configure.ac b/configure.ac
index d83a9bde..7c8ea351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -992,7 +992,7 @@ AC_CONFIG_HEADER(config.h)
 
 AC_OUTPUT_COMMANDS([if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $ac_top_srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi])
 AC_OUTPUT(Makefile tcpdump.1)