summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 18:08:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 18:08:00 +0200
commit7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34 (patch)
treebd2cbe93e80692486c969a80cfececbf8bb6dcdd /source4/build
parentcc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31 (diff)
parentbc4eacb5d89ca8dca123e2d6bd6eba47ed93b771 (diff)
downloadsamba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.tar.gz
samba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.tar.bz2
samba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.zip
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts: source/auth/config.mk source/auth/gensec/config.mk source/torture/smbtorture.c (This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/make/rules.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 078f5d9295..f5d57edb0d 100644
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -212,8 +212,7 @@ include/includes.d: include/includes.h
@-mkdir -p `dirname $@`
@$(COMPILE) && exit 0 ; \
echo "The following command failed:" 1>&2;\
- echo "$(COMPILE)" 1>&2;\
- $(COMPILE) >/dev/null 2>&1
+ echo "$(COMPILE)" 1>&2 && exit 1
.c.ho:
@@ -234,7 +233,7 @@ include/includes.d: include/includes.h
.l.c:
@echo "Building $< with $(LEX)"
- @-$(make_utility_dir)/script/lex_compile.sh "$(LEX)" "$<" "$@"
+ @-$(make_utility_dir)/lex_compile.sh "$(LEX)" "$<" "$@"
%.a:
@echo Linking $@