Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -87,11 +87,11 @@
 	done
 
 depend: pre-depend ${SRCS}
 	regen=0; \
 	for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \
-	if [ $$regen = 1 ]; then \
+	if [ x"$$regen" = x"1" ]; then \
 		error=0; \
 		${DEPEND_STATUS}; \
 		rm -f .deps; \
 		for i in ${SRCS}; do \
 			case $${i##*.} in \
@@ -98,11 +98,11 @@
 			c|cc|cxx|m) \
 				${CPP} ${CPPFLAGS} -M $$i >>.deps || error=1; \
 				;; \
 			esac; \
 		done; \
-		if [ $$error = 0 ]; then \
+		if [ x"$$error" = x"0" ]; then \
 			${DEPEND_OK}; \
 		else \
 			${DEPEND_FAILED}; \
 		fi; \
 	fi
@@ -159,11 +159,11 @@
 		${COMPILE_FAILED}; \
 	fi
 
 .d.o:
 	${COMPILE_STATUS}
-	if test x"$(basename ${DC})" = x"dmd"; then \
+	if [ x"$(basename ${DC})" = x"dmd" ]; then \
 		if ${DC} ${DFLAGS} -c -of$@ $<; then \
 			${COMPILE_OK}; \
 		else \
 			${COMPILE_FAILED}; \
 		fi \