From f32a55e47b3dda974ee5efeb4f7ce7e825c1a2ff Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Tue, 17 Jul 2012 04:14:44 +0000
Subject: [PATCH] fix make args

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@980 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 Makefile.frag | 12 ++++--------
 run           | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Makefile.frag b/Makefile.frag
index 223bc4f..0e0c6f1 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -25,17 +25,13 @@ $(XCACHE_PROC_C): $(XCACHE_PROC_OUT) $(XCACHE_PROC_H)
 	cp $(XCACHE_PROC_OUT) $(XCACHE_PROC_C)
 	-$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
 
-$(builddir)/processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
-processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
+$(builddir)/processor.lo processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
 
-$(builddir)/disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
-disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
+$(builddir)/disassembler.lo disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
 
-$(builddir)/opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
-opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
+$(builddir)/opcode_spec.lo opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
 
-$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
-xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
+$(builddir)/xcache.lo xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
 
 xcachesvnclean: clean
 	cat $(srcdir)/.cvsignore | grep -v ^Makefile | grep -v ^config.nice | xargs rm -rf
diff --git a/run b/run
index b133d82..082f527 100755
--- a/run
+++ b/run
@@ -14,12 +14,6 @@ if echo $basename | grep -- - >/dev/null; then :; else
 	exit
 fi
 
-LANG=C /usr/bin/make $MAKEOPTS "$@" 2>&1 | hi error warn FAIL
-ret=${PIPESTATUS[0]}
-if [[ $ret -ne 0 ]]; then
-	exit $ret
-fi
-
 if [[ ! -z $1 ]]; then
 	type=$1
 	shift
@@ -31,6 +25,16 @@ if [[ ! -z $1 ]]; then
 	fi
 fi
 
+if [[ $type = make ]]; then
+	MAKEARGS=("$@")
+fi
+
+LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 | hi error warn FAIL
+ret=${PIPESTATUS[0]}
+if [[ $ret -ne 0 || $type = make ]]; then
+	exit $ret
+fi
+
 cmd=()
 tracer=()
 case "$basename" in
@@ -54,9 +58,6 @@ fcgi)
 esac
 
 case "$type" in
-make)
-	exit
-	;;
 ltr*)
 	export USE_ZEND_ALLOC=0
 	tracer=(ltrace -s1024 -e malloc,realloc,free,write)