diff options
| author | Tim Potter <tpot@samba.org> | 2003-05-27 02:35:53 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-05-27 02:35:53 +0000 |
| commit | 4e8052640e4029938111d5a1af16865c67e21bf9 (patch) | |
| tree | 8b00e6e2d2c8bcb4062eede5773b2abaf12a4558 /source3/script | |
| parent | ab222b3700313348b2a1b673be82a58cb03c7c79 (diff) | |
| download | samba-4e8052640e4029938111d5a1af16865c67e21bf9.tar.gz samba-4e8052640e4029938111d5a1af16865c67e21bf9.tar.bz2 samba-4e8052640e4029938111d5a1af16865c67e21bf9.zip | |
More fixes for builddir != srcdir.
- Use absolute directories for $builddir and $srcdir in the Makefile
- Don't try and combine source files in $builddir and $srcdir to build
proto.h. It's just too hard to get it right across all targets we
wish to compile on. Use a hand created prototype for the single
function in smbd/build_options.c that we need. This allows us to ditch
all the extra sed work that was causing problems: \t not portable - hah!
- Fix bogus delheaders target to remove the correct files
This appears to work quite nicely now. Let's see how it goes on the
buildfarm machines.
(This used to be commit 456184463d35c18840c39cb3483b7136247ea764)
Diffstat (limited to 'source3/script')
| -rw-r--r-- | source3/script/.cvsignore | 1 | ||||
| -rwxr-xr-x | source3/script/mkproto.sh (renamed from source3/script/mkproto.sh.in) | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source3/script/.cvsignore b/source3/script/.cvsignore index 5efd0d33db..7a8114ecd7 100644 --- a/source3/script/.cvsignore +++ b/source3/script/.cvsignore @@ -1,2 +1 @@ findsmb -mkproto.sh diff --git a/source3/script/mkproto.sh.in b/source3/script/mkproto.sh index 8d7d300ff5..2bf96c9b41 100755 --- a/source3/script/mkproto.sh.in +++ b/source3/script/mkproto.sh @@ -1,13 +1,9 @@ -#! /bin/sh -x +#! /bin/sh LANG=C; export LANG LC_ALL=C; export LC_ALL LC_COLLATE=C; export LC_COLLATE -# Need reference point for "mkproto.awk", including when "srcdir != builddir". -# Use of "abs_..." is unpleasant. Is there another way? -abs_srcdir=@abs_srcdir@ - if [ $# -lt 3 ] then echo "Usage: $0 awk [-h headerdefine] outputheader proto_obj" @@ -36,7 +32,7 @@ echo creating $header mkdir -p `dirname $header` ${awk} $headeropt \ - -f $abs_srcdir/mkproto.awk $proto_src > $headertmp + -f script/mkproto.awk $proto_src > $headertmp if cmp -s $header $headertmp 2>/dev/null then |