summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-10-29 12:08:09 +0200
committerMartin Mares <mj@ucw.cz>1999-10-29 12:08:09 +0200
commit54165b1315dd09b0ea97705367b73086131c1ed8 (patch)
treefbe41c0c4d17a728b7d703f15940511e4f267a02 /tools
parented6081502ad814289b9b7b5537658c3b1ad435e5 (diff)
downloadbird-54165b1315dd09b0ea97705367b73086131c1ed8.tar
bird-54165b1315dd09b0ea97705367b73086131c1ed8.zip
Configure PATH_CONTROL_SOCKET.
autoconf.h is now written to obj/sysdep, the source tree is hopefully completely read-only now.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/mergedirs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergedirs b/tools/mergedirs
index 61b092f..33bcbda 100755
--- a/tools/mergedirs
+++ b/tools/mergedirs
@@ -21,7 +21,7 @@ shift
echo "Merging system-dependent modules ($@)"
MODULES=`for a in $@ ; do
cat $SRCDIR/sysdep/config.h $SRCDIR/$a/Modules |
- $cpp -U unix -D MACROS_ONLY - |
+ $cpp -U unix -D MACROS_ONLY -I $OBJDIR - |
sed "/^[ ]*\$/d;/^#/d;s@\\(.*\\)@\\1 $a/\\1@"
done |
sort +0 -1 -u |