Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -86,12 +86,12 @@
 		${DIR_LEAVE}; \
 	done
 
 depend: pre-depend ${SRCS}
 	regen=0; \
-	for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \
-	if [ x"$$regen" = x"1" ]; then \
+	for i in ${SRCS}; do test $$i -nt .deps && regen=1; done; \
+	if test 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 [ x"$$error" = x"0" ]; then \
+		if test x"$$error" = x"0"; then \
 			${DEPEND_OK}; \
 		else \
 			${DEPEND_FAILED}; \
 		fi; \
 	fi
@@ -157,11 +157,11 @@
 		${COMPILE_FAILED}; \
 	fi
 
 .d.o:
 	${COMPILE_STATUS}
-	if [ x"$(basename ${DC})" = x"dmd" ]; then \
+	if test x"$(basename ${DC})" = x"dmd"; then \
 		if ${DC} ${DFLAGS} -c -of$@ $<; then \
 			${COMPILE_OK}; \
 		else \
 			${COMPILE_FAILED}; \
 		fi \
@@ -267,31 +267,31 @@
 		${MAKE} ${MFLAGS} uninstall || exit 1; \
 		${DIR_LEAVE}; \
 	done
 
 	for i in ${LIB}; do \
-		if [ -f ${DESTDIR}${libdir}/$$i ]; then \
+		if test -f ${DESTDIR}${libdir}/$$i; then \
 			if ${UNINSTALL_LIB}; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi; \
 	done
 
 	for i in ${STATIC_LIB}; do \
-		if [ -f ${DESTDIR}${libdir}/$$i ]; then \
+		if test -f ${DESTDIR}${libdir}/$$i; then \
 			if rm -f ${DESTDIR}${libdir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
 
 	for i in ${PLUGIN}; do \
-		if [ -f ${DESTDIR}${libdir}/${plugindir}/$$i ]; then \
+		if test -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
 			if rm -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
@@ -298,31 +298,31 @@
 		fi \
 	done
 	-rmdir ${DESTDIR}${libdir}/${plugindir} >/dev/null 2>&1
 
 	for i in ${DATA}; do \
-		if [ -f ${DESTDIR}${datadir}/${PACKAGE}/$$i ]; then \
+		if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
 			if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
 
 	for i in ${PROG}; do \
-		if [ -f ${DESTDIR}${bindir}/$$i ]; then \
+		if test -f ${DESTDIR}${bindir}/$$i; then \
 			if rm -f ${DESTDIR}${bindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
 
 	for i in ${INCLUDES}; do \
-		if [ -f ${DESTDIR}${includedir}/${includesubdir}/$$i ]; then \
+		if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
 			if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
@@ -329,11 +329,11 @@
 		fi \
 	done
 	-rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1
 
 	for i in ${MAN}; do \
-		if [ -f ${DESTDIR}${mandir}/${mansubdir}/$$i ]; then \
+		if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
 			if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
@@ -348,11 +348,11 @@
 		${MAKE} ${MFLAGS} clean || exit 1; \
 		${DIR_LEAVE}; \
 	done
 	
 	for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps *~; do \
-		if [ -f $$i -o -d $$i ]; then \
+		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
@@ -365,11 +365,11 @@
 		${MAKE} ${MFLAGS} distclean || exit 1; \
 		${DIR_LEAVE}; \
 	done
 	
 	for i in ${PROG} ${PROG_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST}  ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN}; do \
-		if [ -f $$i -o -d $$i ]; then \
+		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \