summaryrefslogtreecommitdiffstats
path: root/tools/mergedirs
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-03-01 21:15:14 +0100
committerMartin Mares <mj@ucw.cz>1999-03-01 21:15:14 +0100
commitea3582a6f66223dfd2c0dd6c597dc40b48033fd5 (patch)
treee34da6d0e5da9d471aceba22d07bb7c1ad746015 /tools/mergedirs
parent1b769b08c195f7d95525131f65e5794c3c09a335 (diff)
downloadbird-ea3582a6f66223dfd2c0dd6c597dc40b48033fd5.tar
bird-ea3582a6f66223dfd2c0dd6c597dc40b48033fd5.zip
Include "config.h" instead of "autoconf.h" in all Modules lists to make defines
in the static portion of configuration includes available as well.
Diffstat (limited to 'tools/mergedirs')
-rwxr-xr-xtools/mergedirs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mergedirs b/tools/mergedirs
index 4196831..e50d02b 100755
--- a/tools/mergedirs
+++ b/tools/mergedirs
@@ -20,8 +20,8 @@ shift
echo "Merging system-dependent modules ($@)"
MODULES=`for a in $@ ; do
- cat sysdep/autoconf.h $SRCDIR/$a/Modules |
- $cpp -U unix - |
+ cat sysdep/config.h $SRCDIR/$a/Modules |
+ $cpp -U unix -D MACROS_ONLY - |
sed "/^[ ]*\$/d;/^#/d;s@\\(.*\\)@\\1 $a/\\1@"
done |
sort +0 -1 -u |