- semicolon touchup. No other changes

92 files changed, 295 insertions, 295 deletions

diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index 0261a12e7..305daa788 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -60,10 +60,10 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_UTILS_DIR) install
 	mkdir -p $(TARGET_DIR)/usr/bin
 	mkdir -p $(TARGET_DIR)/usr/sbin
-	for file in $(ALSA_UTILS_TARGETS_y) ; do \
+	for file in $(ALSA_UTILS_TARGETS_y); do \
 		cp -dpf $(STAGING_DIR)/$$file $(TARGET_DIR)/$$file; \
 	done
-	if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ] ; then \
+	if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ]; then \
 		mkdir -p $(TARGET_DIR)/usr/share/alsa/speaker-test; \
 		mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \
 		cp -rdpf $(STAGING_DIR)/usr/share/alsa/speaker-test/* $(TARGET_DIR)/usr/share/alsa/speaker-test/; \
@@ -74,10 +74,10 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY
 alsa-utils: uclibc alsa-lib ncurses $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY)
 
 alsa-utils-clean:
-	for file in $(ALSA_UTILS_TARGETS_y) ; do \
+	for file in $(ALSA_UTILS_TARGETS_y); do \
 		rm -f $(TARGET_DIR)/$$file; \
 	done
-	for file in $(ALSA_UTILS_TARGETS_) ; do \
+	for file in $(ALSA_UTILS_TARGETS_); do \
 		rm -f $(TARGET_DIR)/$$file; \
 	done
 	-$(MAKE) -C $(ALSA_UTILS_DIR) clean
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index 413dcc05d..5c283317f 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -26,7 +26,7 @@ $(ARGUS_DIR)/.unpacked: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
 ifneq ($(ARGUS_PATCH),)
 	(cd $(ARGUS_DIR) && $(ARGUS_CAT) $(DL_DIR)/$(ARGUS_PATCH) | patch -p1)
 	if [ -d $(ARGUS_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch; \
 	fi
 endif
 	touch $@
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index c5c42f97f..5028a15a9 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -68,8 +68,8 @@ boa: uclibc $(BOA_WORKDIR)/.installed
 boa-source: $(DL_DIR)/$(BOA_SOURCE)
 
 boa-clean:
-	@if [ -d $(BOA_WORKDIR)/Makefile ] ; then \
-		$(MAKE) -C $(BOA_WORKDIR) clean ; \
+	@if [ -d $(BOA_WORKDIR)/Makefile ]; then \
+		$(MAKE) -C $(BOA_WORKDIR) clean; \
 	fi
 
 boa-dirclean:
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index b01f8731e..2e4edb64e 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -19,14 +19,14 @@ $(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE)
 	touch $(BSDIFF_DIR)/.source
 
 $(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source
-	(cd $(BSDIFF_DIR) ; \
+	(cd $(BSDIFF_DIR); \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
-			$(TARGET_CFLAGS) bsdiff.c -o bsdiff ; \
+			$(TARGET_CFLAGS) bsdiff.c -o bsdiff; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
-			$(TARGET_CFLAGS) bspatch.c -o bspatch ; \
+			$(TARGET_CFLAGS) bspatch.c -o bspatch; \
 	)
 
 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY)
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 5e82b9955..fcf0d9f2d 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -19,7 +19,7 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
 $(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)
 	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.$(BZIP2_VERSION) \
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
 	    libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so
 ifneq ($(BR2_LARGEFILE),y)
 	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile
@@ -37,8 +37,8 @@ $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
 	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
 	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
-	(cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so)
-	(cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
+	(cd $(STAGING_DIR)/usr/lib/; ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so)
+	(cd $(STAGING_DIR)/lib; ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
 	 ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1)
 
 $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)
diff --git a/package/customize/customize.mk b/package/customize/customize.mk
index 9e7f714a4..3774f4bb1 100644
--- a/package/customize/customize.mk
+++ b/package/customize/customize.mk
@@ -7,11 +7,11 @@ CUST_DIR:=package/customize/source
 
 $(BUILD_DIR)/.customize:
 	rm -f $(PROJECT_BUILD_DIR)/series
-	(cd $(CUST_DIR) ; \
+	(cd $(CUST_DIR); \
 	 /bin/ls -d * > $(PROJECT_BUILD_DIR)/series || \
 	 touch $(PROJECT_BUILD_DIR)/series )
-	for f in `cat $(PROJECT_BUILD_DIR)/series` ; do 	\
-		cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f ;	\
+	for f in `cat $(PROJECT_BUILD_DIR)/series`; do 	\
+		cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f;	\
 	done
 	rm -f $(PROJECT_BUILD_DIR)/series
 	touch $@
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 235500f9a..ef3290e1f 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -42,11 +42,11 @@ $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
 ifneq ($(CVS_PATCH),)
 	toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH)
 	if [ -d $(CVS_DIR)/debian/patches ]; then \
-		(cd $(CVS_DIR)/debian/patches && for i in * ; \
-		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i ; \
-		 done ; \
-		) ; \
-		toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \* ; \
+		(cd $(CVS_DIR)/debian/patches && for i in *; \
+		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
+		 done; \
+		); \
+		toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \*; \
 	fi
 endif
 	touch $@
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 5750071df..7718a67b6 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -22,7 +22,7 @@ $(DBUS_GLIB_DIR)/.unpacked: $(DL_DIR)/$(DBUS_GLIB_SOURCE)
 	touch $(DBUS_GLIB_DIR)/.unpacked
 
 $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config
-	(cd $(DBUS_GLIB_DIR); rm -rf config.cache; autoconf ; \
+	(cd $(DBUS_GLIB_DIR); rm -rf config.cache; autoconf; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		ac_cv_have_abstract_sockets=yes \
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 1863accf6..2a6e9eceb 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -44,8 +44,8 @@ dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
 dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
 
 dillo-clean:
-	@if [ -d $(DILLO_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(DILLO_DIR) clean ; \
+	@if [ -d $(DILLO_DIR)/Makefile ]; then \
+		$(MAKE) -C $(DILLO_DIR) clean; \
 	fi
 
 dillo-dirclean:
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index c58ed62c9..3008fb8ff 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -59,8 +59,8 @@ $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked
 $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured
 	$(MAKE1) PATH=$(TARGET_PATH) -C $(E2FSPROGS_DIR)
 	( \
-		cd $(E2FSPROGS_DIR)/misc ; \
-		$(STRIP) $(E2FSPROGS_MISC_STRIP) ; \
+		cd $(E2FSPROGS_DIR)/misc; \
+		$(STRIP) $(E2FSPROGS_MISC_STRIP); \
 	)
 	$(STRIP) $(E2FSPROGS_DIR)/lib/lib*.so.*.*
 	touch -c $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 90afdb7b0..1c664d52c 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -52,10 +52,10 @@ $(FINDUTILS_DIR)/$(FINDUTILS_BINARY): $(FINDUTILS_DIR)/.configured
 
 # This stuff is needed to work around GNU make deficiencies
 findutils-target_binary: $(FINDUTILS_DIR)/$(FINDUTILS_BINARY)
-	@if [ -L $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY) ] ; then \
+	@if [ -L $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY) ]; then \
 		rm -f $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY); fi
 	@if [ ! -f $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) -o $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY) \
-	-ot $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) ] ; then \
+	-ot $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) ]; then \
 	    set -x; \
 	    $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install; \
 	    $(STRIP) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 0aec98b51..7793e9291 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -26,7 +26,7 @@ $(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
 ifneq ($(FLEX_PATCH),)
 	toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
 	if [ -d $(FLEX_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch; \
 	fi
 endif
 	$(CONFIG_UPDATE) $(FLEX_DIR)
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index e9b9f0d42..23adfc9dd 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -30,7 +30,7 @@ $(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE)
 	touch $@
 
 $(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked
-	(cd $(FONTCONFIG_DIR); rm -rf config.cache ; \
+	(cd $(FONTCONFIG_DIR); rm -rf config.cache; \
 		$(AUTORECONF) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index db057c164..79d8ca632 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -76,7 +76,7 @@ GMP_DIR2:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)-host
 GMP_HOST_DIR:=$(TOOL_BUILD_DIR)/gmp
 $(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked
 	mkdir -p $(GMP_DIR2)
-	(cd $(GMP_DIR2); rm -rf config.cache ; \
+	(cd $(GMP_DIR2); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		$(GMP_CPP_FLAGS) \
 		$(GMP_DIR)/configure \
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 02add799b..66eb7021f 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -55,10 +55,10 @@ $(GNUGREP_DIR)/$(GNUGREP_BINARY): $(GNUGREP_DIR)/.configured
 
 # This stuff is needed to work around GNU make deficiencies
 grep-target_binary: $(GNUGREP_DIR)/$(GNUGREP_BINARY)
-	@if [ -L $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY) ] ; then \
+	@if [ -L $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY) ]; then \
 		rm -f $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY); fi
 	@if [ ! -f $(GNUGREP_DIR)/$(GNUGREP_BINARY) -o $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY) -ot \
-	$(GNUGREP_DIR)/$(GNUGREP_BINARY) ] ; then \
+	$(GNUGREP_DIR)/$(GNUGREP_BINARY) ]; then \
 	    set -x; \
 	    rm -f $(TARGET_DIR)/bin/grep $(TARGET_DIR)/bin/egrep $(TARGET_DIR)/bin/fgrep; \
 	    cp -a $(GNUGREP_DIR)/src/grep $(GNUGREP_DIR)/src/egrep \
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index a8655fec1..ecf496324 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -58,8 +58,8 @@ iperf: $(TARGET_DIR)/usr/bin/iperf
 iperf-source: $(DL_DIR)/$(IPERF_SOURCE)
 
 iperf-clean:
-	@if [ -d $(IPERF_KDIR)/Makefile ] ; then \
-		$(MAKE) -C $(IPERF_DIR) clean ; \
+	@if [ -d $(IPERF_KDIR)/Makefile ]; then \
+		$(MAKE) -C $(IPERF_DIR) clean; \
 	fi
 
 iperf-dirclean:
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index d3d2e6194..1b5ab3509 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -68,7 +68,7 @@ $(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
 	touch $@
 
 $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched
-	( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache ; \
+	( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 	  ./configure \
@@ -84,12 +84,12 @@ $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched
 	  $(IPSEC_TOOLS_CONFIG_FLAGS) \
 	); 
 	# simpler than patching that cruft..
-	(echo '#undef bzero' ; \
-	 echo '#define bzero(a, b) memset((a), 0, (b))' ; \
-	 echo '#undef bcopy' ; \
-	 echo '#define bcopy(src, dest, len) memmove(dest, src, len)' ; \
-	 echo '#undef index' ; \
-	 echo '#define index(a, b) strchr(a, b)' ; \
+	(echo '#undef bzero'; \
+	 echo '#define bzero(a, b) memset((a), 0, (b))'; \
+	 echo '#undef bcopy'; \
+	 echo '#define bcopy(src, dest, len) memmove(dest, src, len)'; \
+	 echo '#undef index'; \
+	 echo '#define index(a, b) strchr(a, b)'; \
 	) >> $(IPSEC_TOOLS_DIR)/config.h
 	touch $@
 
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 130d5a01e..c1af4c2d5 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -35,8 +35,8 @@ $(KEXEC_DIR)/.unpacked: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH)
 	$(KEXEC_CAT) $(DL_DIR)/$(KEXEC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifneq ($(KEXEC_PATCH),)
 	(cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1;	\
-	for f in `cat debian/patches/00list` ; do	\
-		cat debian/patches/$$f | patch -p2 ; 	\
+	for f in `cat debian/patches/00list`; do	\
+		cat debian/patches/$$f | patch -p2; 	\
 	done)
 endif
 	toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.patch
diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk
index c7d49b51a..ab90ab94a 100644
--- a/package/l2tp/l2tp.mk
+++ b/package/l2tp/l2tp.mk
@@ -26,7 +26,7 @@ $(L2TP_DIR)/.unpacked: $(DL_DIR)/$(L2TP_SOURCE) $(DL_DIR)/$(L2TP_PATCH)
 ifneq ($(L2TP_PATCH),)
 	(cd $(L2TP_DIR) && $(L2TP_CAT) $(DL_DIR)/$(L2TP_PATCH) | patch -p1)
 	if [ -d $(L2TP_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(L2TP_DIR) $(L2TP_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(L2TP_DIR) $(L2TP_DIR)/debian/patches \*.patch; \
 	fi
 endif
 	toolchain/patch-kernel.sh $(L2TP_DIR) package/l2tp/ l2tp\*.patch
diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk
index b0c15100d..535aca790 100644
--- a/package/libfloat/libfloat.mk
+++ b/package/libfloat/libfloat.mk
@@ -40,12 +40,12 @@ $(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked $(TARGET_CC)
 $(STAGING_DIR)/lib/libfloat.so: $(LIBFLOAT_DIR)/libfloat.so.1
 	cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(STAGING_DIR)/lib/libfloat.a
 	cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(STAGING_DIR)/lib/libfloat.so.1
-	(cd $(STAGING_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so)
+	(cd $(STAGING_DIR)/lib; ln -snf libfloat.so.1 libfloat.so)
 	cp -dpf $(LIBFLOAT_DIR)/libfloat.a $(TARGET_DIR)/usr/lib/libfloat.a
 	cp -dpf $(LIBFLOAT_DIR)/libfloat.so.1 $(TARGET_DIR)/lib/libfloat.so.1
 	$(STRIP) $(TARGET_DIR)/lib/libfloat.so.1 > /dev/null 2>&1
-	(cd $(TARGET_DIR)/lib ; ln -snf libfloat.so.1 libfloat.so)
-	(cd $(TARGET_DIR)/usr/lib ; ln -snf /lib/libfloat.so libfloat.so)
+	(cd $(TARGET_DIR)/lib; ln -snf libfloat.so.1 libfloat.so)
+	(cd $(TARGET_DIR)/usr/lib; ln -snf /lib/libfloat.so libfloat.so)
 
 libfloat: $(STAGING_DIR)/lib/libfloat.so
 
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index 581d12eb4..f68cf7f8e 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -52,8 +52,8 @@ libid3tag: uclibc libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN)
 libid3tag-source: $(DL_DIR)/$(LIBID3TAG_SOURCE)
 
 libid3tag-clean:
-	@if [ -d $(LIBID3TAG_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(LIBID3TAG_DIR) clean ; \
+	@if [ -d $(LIBID3TAG_DIR)/Makefile ]; then \
+		$(MAKE) -C $(LIBID3TAG_DIR) clean; \
 	fi
 	rm -f $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN)
 	rm -f $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN)
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 242dc92bc..e1360e98b 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -58,8 +58,8 @@ libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
 libmad-source: $(DL_DIR)/$(LIBMAD_SOURCE)
 
 libmad-clean:
-	@if [ -d $(LIBMAD_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(LIBMAD_DIR) clean ; \
+	@if [ -d $(LIBMAD_DIR)/Makefile ]; then \
+		$(MAKE) -C $(LIBMAD_DIR) clean; \
 	fi
 	rm -f $(STAGING_DIR)/usr/lib/libmad.*
 	rm -f $(STAGING_DIR)/usr/include/mad.h
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 0b1267a16..7ab675200 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -38,7 +38,7 @@ $(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
 	touch $@
 
 $(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
-	(cd $(LIBPCAP_DIR) ; rm -rf config.cache ; \
+	(cd $(LIBPCAP_DIR); rm -rf config.cache; \
 		ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
 		BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
 		$(TARGET_CONFIGURE_OPTS) \
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index 598bf4ffe..f04c40917 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -17,7 +17,7 @@ $(LIBRAW1394_DIR)/.unpacked: $(DL_DIR)/$(LIBRAW1394_SOURCE)
 	touch $@
 
 $(LIBRAW1394_DIR)/.configured: $(LIBRAW1394_DIR)/.unpacked
-	(cd $(LIBRAW1394_DIR); rm -rf config.cache ; \
+	(cd $(LIBRAW1394_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 9166480f6..b7d453550 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -38,7 +38,7 @@ $(LIBSYSFS_DIR)/.unpacked: $(DL_DIR)/$(LIBSYSFS_SOURCE)
 	touch $@
 
 $(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked
-	(cd $(LIBSYSFS_DIR); rm -rf config.cache ; \
+	(cd $(LIBSYSFS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 11e24675d..b4b805ea4 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -79,8 +79,8 @@ libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2 $(TARGET_DIR)/usr/lib/
 libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE)
 
 libxml2-clean:
-	@if [ -d $(LIBXML2_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(LIBXML2_DIR) clean ; \
+	@if [ -d $(LIBXML2_DIR)/Makefile ]; then \
+		$(MAKE) -C $(LIBXML2_DIR) clean; \
 	fi
 	rm -f $(STAGING_DIR)/usr/lib/libxml2.*
 	rm -f $(TARGET_DIR)/usr/lib/libxml2.*
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 8dc9437e6..bcbd48406 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -28,7 +28,7 @@ ifneq ($(LIGHTTPD_PATCH),)
 	(cd $(LIGHTTPD_DIR)&&$(LIGHTTPD_CAT) $(LIGHTTPD_PATCH_FILE)|patch -p1)
 endif
 	if [ -d $(LIGHTTPD_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(LIGHTTPD_DIR) $(LIGHTTPD_DIR)/debian/patches \*.dpatch ; \
+		toolchain/patch-kernel.sh $(LIGHTTPD_DIR) $(LIGHTTPD_DIR)/debian/patches \*.dpatch; \
 	fi
 	$(CONFIG_UPDATE) $(@D)
 	$(SED) 's/-lfs/-largefile/g;s/_lfs/_largefile/g' $(LIGHTTPD_DIR)/configure
@@ -70,7 +70,7 @@ $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
 	@rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la
 	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so
 	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
-	@if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ]; then \
 		$(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
 	fi
 	$(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 21f317f8d..538805c76 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -39,7 +39,7 @@ endif
 	touch $@
 
 $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched
-	(cd $(LTRACE_DIR); rm -rf config.cache ; \
+	(cd $(LTRACE_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index bff2fd48c..9a5a104f5 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -36,7 +36,7 @@ $(LZMA_HOST_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
 	touch $@
 
 $(LZMA_HOST_DIR)/.configured: $(LZMA_HOST_DIR)/.unpacked
-	(cd $(LZMA_HOST_DIR); rm -f config.cache ;\
+	(cd $(LZMA_HOST_DIR); rm -f config.cache;\
 		CC="$(HOSTCC)" \
 		CXX="$(HOSTCXX)" \
 		./configure \
@@ -55,9 +55,9 @@ $(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma
 
 .PHONY: lzma-host use-lzma-host-binary
 use-lzma-host-binary:
-	if [ ! -f "$(TOOL_BUILD_DIR)/bin/lzma" ] ; then \
-		[ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin ; \
-		ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOL_BUILD_DIR)/bin/lzma" ; \
+	if [ ! -f "$(TOOL_BUILD_DIR)/bin/lzma" ]; then \
+		[ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin; \
+		ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOL_BUILD_DIR)/bin/lzma"; \
 	fi
 
 build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma
@@ -89,7 +89,7 @@ $(LZMA_TARGET_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
 	touch $@
 
 $(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.unpacked
-	(cd $(LZMA_TARGET_DIR); rm -f config.cache ;\
+	(cd $(LZMA_TARGET_DIR); rm -f config.cache;\
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		CFLAGS="$(TARGET_CFLAGS) $(LZMA_CFLAGS)" \
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index c8e7b995f..65ba76d32 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -27,7 +27,7 @@ $(MDADM_DIR)/.unpacked: $(DL_DIR)/$(MDADM_SOURCE)
 ifneq ($(MDADM_PATCH),)
 	(cd $(MDADM_DIR) && $(MDADM_CAT) $(MDADM_PATCH_FILE) | patch -p1)
 	if [ -d $(MDADM_DIR)/debian/patches ]; then \
-	  toolchain/patch-kernel.sh $(MDADM_DIR) $(MDADM_DIR)/debian/patches \*patch ; \
+	  toolchain/patch-kernel.sh $(MDADM_DIR) $(MDADM_DIR)/debian/patches \*patch; \
 	fi
 endif
 	#toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-$(MDADM_VERSION)\*.patch
diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk
index 201a26194..c6b4c9baf 100644
--- a/package/microcom/microcom.mk
+++ b/package/microcom/microcom.mk
@@ -47,7 +47,7 @@ $(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
 
 $(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
 ifeq ($(BR2_PREFER_IMA),y)
-	(cd $(MICROCOM_DIR) ; \
+	(cd $(MICROCOM_DIR); \
 	 $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
 	 	$(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \
 	)
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index ea4f92037..5044ea287 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -28,17 +28,17 @@ $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 $(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.source
 ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
 	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR) ; ./Configure -de ; \
-	 $(MAKE) CC="$(HOSTCC)" ; \
-	 $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" ; \
+	(cd $(MICROPERL_DIR); ./Configure -de; \
+	 $(MAKE) CC="$(HOSTCC)"; \
+	 $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
 	)
 endif
-	(cd $(MICROPERL_DIR) ; chmod u+w uconfig.h ; . ./uconfig.sh ; \
-	 $(MAKE) -f Makefile.micro regen_uconfig ; \
+	(cd $(MICROPERL_DIR); chmod u+w uconfig.h; . ./uconfig.sh; \
+	 $(MAKE) -f Makefile.micro regen_uconfig; \
 	 $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
 		 -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
 		 -e 's,BIN ".*,BIN "/usr/bin",' \
-		 ./uconfig.h ; \
+		 ./uconfig.h; \
 	)
 	touch $@
 
@@ -46,24 +46,24 @@ $(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
 	$(MAKE) -f Makefile.micro CC=$(TARGET_CC) \
 		OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
 ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
-	#(cd $(@D) ; \
-	# CONFIG=uconfig.h $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" ; \
+	#(cd $(@D); \
+	# CONFIG=uconfig.h $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
 	#)
 endif
 
 $(TARGET_DIR)/usr/bin/microperl: $(MICROPERL_DIR)/microperl
 ifneq ($(MICROPERL_MODS),)
-	(cd $(MICROPERL_DIR) ; \
-	 for i in $(patsubst %,$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/%,$(dir $(MICROPERL_MODS))) ; do \
-		[ -d $$i ] || mkdir -p $$i ; \
-	 done ; \
-	 for i in $(MICROPERL_MODS) ; do \
-	 cp -dpf lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i ; \
+	(cd $(MICROPERL_DIR); \
+	 for i in $(patsubst %,$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/%,$(dir $(MICROPERL_MODS))); do \
+		[ -d $$i ] || mkdir -p $$i; \
+	 done; \
+	 for i in $(MICROPERL_MODS); do \
+	 cp -dpf lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
 	 done; \
 	)
 endif
 	cp -dpf $(MICROPERL_DIR)/microperl $(TARGET_DIR)/usr/bin/microperl
-	(cd $(TARGET_DIR)/usr/bin ; rm -f perl ; ln -s microperl perl ;)
+	(cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)
 
 microperl: uclibc $(TARGET_DIR)/usr/bin/microperl
 
diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk
index 4490cb769..05f1107c2 100644
--- a/package/mpatrol/mpatrol.mk
+++ b/package/mpatrol/mpatrol.mk
@@ -58,7 +58,7 @@ $(TARGET_DIR)/$(MPATROL_TARGET_BINARY): $(MPATROL_BUILD_DIR)/$(MPATROL_BINARY)
 	(cd $(MPATROL_BUILD_DIR); \
 		cp -dpf lib*.so* $(TARGET_DIR)/usr/lib; \
 		cp -dpf mpatrol mprof mptrace mleak $(TARGET_DIR)/usr/bin)
-	if [ ! -e $(TARGET_DIR)/lib/libpthread.so ] ; then \
+	if [ ! -e $(TARGET_DIR)/lib/libpthread.so ]; then \
 		ln -sf libpthread.so.0 $(TARGET_DIR)/lib/libpthread.so; fi
 	(cd $(MPATROL_DIR); \
 		cp -dpf bin/mp* bin/hexwords $(TARGET_DIR)/usr/bin; \
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 67a396211..8bf405403 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -42,7 +42,7 @@ endif
 	toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch
 	$(CONFIG_UPDATE) $(MPFR_DIR)
 ifneq ($(MPFR_PATCH),)
-	( cd $(MPFR_DIR) ; patch -p1 < $(DL_DIR)/$(MPFR_PATCH_FILE) ; )
+	( cd $(MPFR_DIR); patch -p1 < $(DL_DIR)/$(MPFR_PATCH_FILE); )
 endif
 	touch $@
 
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 48a5d31a5..3e1f32b73 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -42,8 +42,8 @@ nbd: uclibc $(TARGET_DIR)/sbin/nbd-client
 nbd-source: $(DL_DIR)/$(NBD_SOURCE)
 
 nbd-clean:
-	@if [ -d $(NBD_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(NBD_DIR) clean ; \
+	@if [ -d $(NBD_DIR)/Makefile ]; then \
+		$(MAKE) -C $(NBD_DIR) clean; \
 	fi
 
 nbd-dirclean:
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index e301b72ec..47b65d00b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -130,9 +130,9 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
 	cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
 	cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
 	rm -f $(TARGET_DIR)/usr/lib/terminfo
-	(cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo ; \
-	 ln -fs libncurses.a libcurses.a ; \
-	 ln -fs libncurses.a libtermcap.a ; \
+	(cd $(TARGET_DIR)/usr/lib; ln -fs ../share/terminfo; \
+	 ln -fs libncurses.a libcurses.a; \
+	 ln -fs libncurses.a libtermcap.a; \
 	)
 	(cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h)
 	rm -f $(TARGET_DIR)/lib/libncurses.so
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 76127b576..5636877cb 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -39,7 +39,7 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY
 	# Only install a few selected items...
 	mkdir -p $(TARGET_DIR)/usr/sbin
 	cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
-	@if [ ! -f $(TARGET_DIR)/etc/inetd.conf ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \
 		mkdir -p $(TARGET_DIR)/etc; \
 		cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/; \
 		$(SED) "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf; \
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 7ceea78bb..68c3238cd 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -65,7 +65,7 @@ $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY)
 	echo 'rm -f $(TARGET_DIR)/usr/bin/event_rpcgen.py $(TARGET_DIR)/usr/sbin/nhfs* $(TARGET_DIR)/usr/sbin/nfsstat $(TARGET_DIR)/usr/sbin/showmount' >> $@
 	echo 'rm -rf $(TARGET_DIR)/usr/share/man' >> $@
 	echo '$(INSTALL) -m 0755 package/nfs-utils/S60nfs $(TARGET_DIR)/etc/init.d' >> $@
-	echo -n 'for file in $(NFS_UTILS_TARGETS_) ; do rm -f $(TARGET_DIR)/' >> $@
+	echo -n 'for file in $(NFS_UTILS_TARGETS_); do rm -f $(TARGET_DIR)/' >> $@
 	echo -n "\$$" >> $@
 	echo "file; done" >> $@
 	echo 'rm -rf $(TARGET_DIR)/var/lib/nfs' >> $@
@@ -77,7 +77,7 @@ nfs-utils: uclibc host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY)
 
 nfs-utils-clean:
 	rm -f $(TARGET_DIR)/etc/init.d/S60nfs
-	for file in $(NFS_UTILS_TARGETS_y) ; do \
+	for file in $(NFS_UTILS_TARGETS_y); do \
 		rm -f $(TARGET_DIR)/$$file; \
 	done
 	-$(MAKE) -C $(NFS_UTILS_DIR) clean
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index ba853c8f1..c374e74ec 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -37,15 +37,15 @@ $(OPENNTPD_DIR)/.configured: $(OPENNTPD_DIR)/.source
 
 $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(OPENNTPD_DIR)
-	#(cd $(OPENNTPD_DIR) ; \
-	# $(YACC) parse.y ; \
+	#(cd $(OPENNTPD_DIR); \
+	# $(YACC) parse.y; \
 	# $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
 	# 	$(CFLAGS_WHOLE_PROGRAM) -I$(OPENNTPD_DIR) \
 	#	-D__dead="__attribute((__noreturn__))" -DHAVE_INTXX_T=1 \
 	#	-include defines.h \
 	#	-o $@ \
 	#	ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \
-	#	server.c client.c sensors.c util.c ; \
+	#	server.c client.c sensors.c util.c; \
 	#)
 	$(STRIP) $@
 
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 8093951f0..cecedaa7d 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -18,7 +18,7 @@ $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
 	touch $@
 
 $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
-	(cd $(OPENSSH_DIR); rm -rf config.cache; autoconf ; \
+	(cd $(OPENSSH_DIR); rm -rf config.cache; autoconf; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 3ca62be89..08d0b934a 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -60,15 +60,15 @@ $(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_DIR)/apps/openssl
 	$(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr -C $(OPENSSL_DIR) install
 	cp -fa $(OPENSSL_DIR)/libcrypto.so* $(STAGING_DIR)/usr/lib/
 	chmod a-x $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.7
-	(cd $(STAGING_DIR)/usr/lib ; \
-	 ln -fs libcrypto.so.0.9.7 libcrypto.so ; \
-	 ln -fs libcrypto.so.0.9.7 libcrypto.so.0 ; \
+	(cd $(STAGING_DIR)/usr/lib; \
+	 ln -fs libcrypto.so.0.9.7 libcrypto.so; \
+	 ln -fs libcrypto.so.0.9.7 libcrypto.so.0; \
 	)
 	cp -fa $(OPENSSL_DIR)/libssl.so* $(STAGING_DIR)/usr/lib/
 	chmod a-x $(STAGING_DIR)/usr/lib/libssl.so.0.9.7
-	(cd $(STAGING_DIR)/usr/lib ; \
-	 ln -fs libssl.so.0.9.7 libssl.so ; \
-	 ln -fs libssl.so.0.9.7 libssl.so.0 ; \
+	(cd $(STAGING_DIR)/usr/lib; \
+	 ln -fs libssl.so.0.9.7 libssl.so; \
+	 ln -fs libssl.so.0.9.7 libssl.so.0; \
 	)
 	touch -c $@
 
diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk
index b3ba6b10c..2304463c3 100644
--- a/package/pcmcia/pcmcia.mk
+++ b/package/pcmcia/pcmcia.mk
@@ -40,7 +40,7 @@ $(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked
 	touch $(PCMCIA_DIR)/.patched
 
 $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
-	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX26_DIR) --noprompt \
+	( cd $(PCMCIA_DIR); ./Configure --kernel=$(LINUX26_DIR) --noprompt \
 		--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
 		--sysv --kcc=$(KERNEL_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
 		--target=$(TARGET_DIR))
@@ -51,10 +51,10 @@ $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
 
 $(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured
 	$(MAKE) -C $(PCMCIA_DIR) -i all
-	-A=`find $(PCMCIA_DIR) -type f -perm +111` ; \
+	-A=`find $(PCMCIA_DIR) -type f -perm +111`; \
 	for fo in $$A; do \
 		file $$fo | grep "ELF" | grep "executable" > /dev/null 2>&1; \
-		if [ $$? = 0 ] ; then \
+		if [ $$? = 0 ]; then \
 			$(STRIP) $$fo; \
 		fi; \
 	done
diff --git a/package/portage/portage.mk b/package/portage/portage.mk
index ba2d4e718..b21ed5ca9 100644
--- a/package/portage/portage.mk
+++ b/package/portage/portage.mk
@@ -109,10 +109,10 @@ $(TARGET_DIR)/$(PORTAGE_TARGET_BINARY): $(PORTAGE_DIR)/.compiled
 	$(dodir) $(PORTAGE_TARGET_DIR)/usr/sbin
 	$(dosym) newins $(PORTAGE_TARGET_DIR)/bin/donewins
 	for sbin in pkgmerge ebuild ebuild.sh etc-update dispatch-conf \
-		archive-conf fixpackages env-update regenworld emerge-webrsync ; do \
+		archive-conf fixpackages env-update regenworld emerge-webrsync; do \
 		$(dosym) ../lib/portage/bin/$${sbin} $(TARGET_DIR)/usr/sbin/$${sbin}; \
 	done
-	for bin in xpak repoman tbz2tool portageq g-cpan.pl quickpkg emerge ; do \
+	for bin in xpak repoman tbz2tool portageq g-cpan.pl quickpkg emerge; do \
 		$(dosym) ../lib/portage/bin/$${bin} $(TARGET_DIR)/usr/bin/$${bin}; \
 	done
 $(TARGET_DIR)/$(SANDBOX_TARGET_BINARY): $(SANDBOX_DIR)/.compiled
@@ -127,10 +127,10 @@ portage-clean:
 	rm -rf $(PORTAGE_TARGET_DIR)
 
 	for sbin in pkgmerge ebuild ebuild.sh etc-update dispatch-conf \
-		archive-conf fixpackages env-update regenworld emerge-webrsync ; do \
+		archive-conf fixpackages env-update regenworld emerge-webrsync; do \
 		rm -f $(TARGET_DIR)/usr/sbin/$${sbin}; \
 	done
-	for bin in xpak repoman tbz2tool portageq g-cpan.pl quickpkg emerge ; do \
+	for bin in xpak repoman tbz2tool portageq g-cpan.pl quickpkg emerge; do \
 		rm -f $(TARGET_DIR)/usr/bin/$${bin}; \
 	done
 sandbox-clean:
diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index 90d3b4034..f73c1c770 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -35,8 +35,8 @@ procps-clean:
 	for bin in uptime tload free w \
 		   top vmstat watch skill \
 		   snice kill sysctl pmap \
-		   pgrep pkill slabtop ; do \
-		rm -f $(TARGET_DIR)/usr/bin/$${bin} ; \
+		   pgrep pkill slabtop; do \
+		rm -f $(TARGET_DIR)/usr/bin/$${bin}; \
 	done
 	rm -f $(TARGET_DIR)/lib/libproc*
 
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 85b60232f..c7a6ab472 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -58,7 +58,7 @@ $(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured
 $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY)
 	cp -a $(PROFTPD_DIR)/$(PROFTPD_BINARY)	\
 		$(TARGET_DIR)/$(PROFTPD_TARGET_BINARY)
-	@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \
 		$(INSTALL) -m 0644 -D $(PROFTPD_DIR)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
 	fi
 	$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 57e4aa134..a0ad9174a 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -43,8 +43,8 @@ psmisc: uclibc ncurses $(TARGET_DIR)/$(PSMISC_TARGET_BINARY)
 psmisc-source: $(DL_DIR)/$(PSMISC_SOURCE)
 
 psmisc-clean:
-	for bin in fuser killall pstree oldfuser pstree.x11 ; do \
-		rm -f $(TARGET_DIR)/bin/$${bin} ; \
+	for bin in fuser killall pstree oldfuser pstree.x11; do \
+		rm -f $(TARGET_DIR)/bin/$${bin}; \
 	done
 
 psmisc-dirclean:
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 75cc04c73..1a670ace2 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -129,7 +129,7 @@ $(QUAGGA_DIR)/.unpacked: $(DL_DIR)/$(QUAGGA_SOURCE) $(DL_DIR)/$(QUAGGA_PATCH)
 ifneq ($(QUAGGA_PATCH),)
 	(cd $(QUAGGA_DIR) && $(QUAGGA_CAT) $(DL_DIR)/$(QUAGGA_PATCH) | patch -p1)
 	if [ -d $(QUAGGA_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(QUAGGA_DIR) $(QUAGGA_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(QUAGGA_DIR) $(QUAGGA_DIR)/debian/patches \*.patch; \
 	fi
 endif
 	touch $@
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index f1c873464..f3bbd2a34 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -44,8 +44,8 @@ rdesktop: uclibc openssl $(XSERVER) $(RDESKTOP_DIR)/.installed
 rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
 
 rdesktop-clean:
-	@if [ -d $(RDESKTOP_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(RDESKTOP_DIR) clean ; \
+	@if [ -d $(RDESKTOP_DIR)/Makefile ]; then \
+		$(MAKE) -C $(RDESKTOP_DIR) clean; \
 	fi
 
 rdesktop-dirclean:
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 0584c27e3..c86085d33 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -91,15 +91,15 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY)
 		CONFIGDIR="${TARGET_DIR}/etc/samba" \
 		VARDIR="${TARGET_DIR}/var/log/samba" \
 		-C $(SAMBA_DIR) installservers installbin installcifsmount
-	for file in $(SAMBA_TARGETS_) ; do \
+	for file in $(SAMBA_TARGETS_); do \
 		rm -f $(TARGET_DIR)/$$file; \
 	done
 	$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
-	for file in $(SAMBA_TARGETS_y) ; do \
+	for file in $(SAMBA_TARGETS_y); do \
 		$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \
 	done
 	$(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d
-	@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ]; then \
 		$(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \
 	fi
 	rm -rf $(TARGET_DIR)/var/cache/samba
@@ -109,7 +109,7 @@ samba: uclibc $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
 
 samba-clean:
 	rm -f $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
-	for file in $(SAMBA_TARGETS_y) ; do \
+	for file in $(SAMBA_TARGETS_y); do \
 		rm -f $(TARGET_DIR)/$$file; \
 	done
 	rm -f $(TARGET_DIR)/etc/init.d/S91smb
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 9e6c52c03..414bdaebd 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -24,7 +24,7 @@ $(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
 	touch $@
 
 $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
-	(cd $(SDL_DIR); rm -rf config.cache ; \
+	(cd $(SDL_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index e43882df0..962ae60b6 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -30,7 +30,7 @@ $(SETSERIAL_DIR)/.unpacked: $(DL_DIR)/$(SETSERIAL_SOURCE) $(SETSERIAL_PATCH)
 ifneq ($(SETSERIAL_PATCH_FILE),)
 	toolchain/patch-kernel.sh $(SETSERIAL_DIR) $(DL_DIR) $(SETSERIAL_PATCH_FILE)
 	if [ -d $(SETSERIAL_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(SETSERIAL_DIR) $(SETSERIAL_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(SETSERIAL_DIR) $(SETSERIAL_DIR)/debian/patches \*.patch; \
 	fi
 endif
 	touch $(SETSERIAL_DIR)/gorhack.h
@@ -41,7 +41,7 @@ SETSERIAL_CFLAGS=$(CFLAGS_COMBINE) $(CFLAGS_WHOLE_PROGRAM)
 endif
 
 $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked
-	(cd $(SETSERIAL_DIR); rm -rf config.cache ; \
+	(cd $(SETSERIAL_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		CFLAGS="$(TARGET_CFLAGS) $(SETSERIAL_CFLAGS)" \
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index c2ff2eb48..c66c9435b 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -64,8 +64,8 @@ socat: uclibc $(SOCAT_WORKDIR)/.installed
 socat-source: $(DL_DIR)/$(SOCAT_SOURCE)
 
 socat-clean:
-	@if [ -d $(SOCAT_WORKDIR)/Makefile ] ; then \
-		$(MAKE) -C $(SOCAT_WORKDIR) clean ; \
+	@if [ -d $(SOCAT_WORKDIR)/Makefile ]; then \
+		$(MAKE) -C $(SOCAT_WORKDIR) clean; \
 	fi
 
 socat-dirclean:
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 79645c0f2..e4b981fcd 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -67,8 +67,8 @@ sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
 
 sqlite-clean:
-	@if [ -d $(SQLITE_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(SQLITE_DIR) clean ; \
+	@if [ -d $(SQLITE_DIR)/Makefile ]; then \
+		$(MAKE) -C $(SQLITE_DIR) clean; \
 	fi
 
 sqlite-dirclean:
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index a99111d88..e60a345dc 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -24,8 +24,8 @@ $(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked
 	CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC=$(TARGET_CC) -C $(SYSVINIT_DIR)/src
 
 $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY)
-	for x in halt init shutdown ; do \
-		install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1 ; \
+	for x in halt init shutdown; do \
+		install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
 	done
 
 sysvinit: uclibc ncurses $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)
@@ -33,8 +33,8 @@ sysvinit: uclibc ncurses $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)
 sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE)
 
 sysvinit-clean:
-	for x in halt init shutdown ; do \
-		rm -f $(TARGET_DIR)/sbin/$$x || exit 1 ; \
+	for x in halt init shutdown; do \
+		rm -f $(TARGET_DIR)/sbin/$$x || exit 1; \
 	done
 	-$(MAKE) -C $(SYSVINIT_DIR) clean
 
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index ad2c03799..8304e164b 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -52,10 +52,10 @@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured
 
 # This stuff is needed to work around GNU make deficiencies
 tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY)
-	@if [ -L $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) ] ; then \
+	@if [ -L $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) ]; then \
 		rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi
 	@if [ ! -f $(GNUTAR_DIR)/$(GNUTAR_BINARY) -o $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) \
-	-ot $(GNUTAR_DIR)/$(GNUTAR_BINARY) ] ; then \
+	-ot $(GNUTAR_DIR)/$(GNUTAR_BINARY) ]; then \
 	    set -x; \
 	    rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \
 	    cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi 
diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk
index 07453c0cf..086973532 100644
--- a/package/tcpdump/dhcpdump.mk
+++ b/package/tcpdump/dhcpdump.mk
@@ -23,7 +23,7 @@ $(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
 
 $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
 	( \
-		cd $(DHCPDUMP_DIR) ; \
+		cd $(DHCPDUMP_DIR); \
 		BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index f125c7f7e..2a8dd1ef2 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -24,7 +24,7 @@ $(TCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(TCPDUMP_SOURCE)
 
 $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
 	( \
-		cd $(TCPDUMP_DIR) ; \
+		cd $(TCPDUMP_DIR); \
 		ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
 		BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
 		$(TARGET_CONFIGURE_OPTS) \
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 3482e12a0..575092169 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -50,14 +50,14 @@ $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY): $(TFTP_HPA_DIR)/.configured
 
 # This stuff is needed to work around GNU make deficiencies
 $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY): $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY)
-	@if [ -L $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) ] ; then \
+	@if [ -L $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) ]; then \
 		rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi
 	@if [ ! -f $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) -o $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) \
-	-ot $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) ] ; then \
+	-ot $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) ]; then \
 	    set -x; \
 	    rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); \
 	    cp -a $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi 
-	@if [ ! -f $(TARGET_DIR)/etc/init.d/S80tftpd-hpa ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/init.d/S80tftpd-hpa ]; then \
 		$(INSTALL) -m 0755 package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d; \
 	fi
 
diff --git a/package/tinyx-old/tinyx.mk b/package/tinyx-old/tinyx.mk
index 557348252..06ea37772 100644
--- a/package/tinyx-old/tinyx.mk
+++ b/package/tinyx-old/tinyx.mk
@@ -84,8 +84,8 @@ $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE)
 $(TINYX_XFBDEV): $(TINYX_DIR)/.configure
 	rm -f $(TINYX_BINX)/Xfbdev
 	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"
-	#( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
-	#( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
+	#( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
+	#( cd $(TINYX_DIR); $(TARGET_CONFIGURE_OPTS) $(MAKE) World )
 	#
 	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
 	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
@@ -97,7 +97,7 @@ $(TINYX_XFBDEV): $(TINYX_DIR)/.configure
 	#echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile
 	#echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile
 	#cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile
-	( cd $(TINYX_DIR) ; $(MAKE) World )
+	( cd $(TINYX_DIR); $(MAKE) World )
 
 #
 # Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
@@ -114,9 +114,9 @@ $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
 $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
 	-mkdir $(TARGET_DIR)/usr/X11R6
 	-mkdir $(TINYX_BINX)
-	for file in $(TINYX_APPS) ; do \
-		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX) ; \
-		$(STRIP) $(TINYX_PROGS)/$$file ; \
+	for file in $(TINYX_APPS); do \
+		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \
+		$(STRIP) $(TINYX_PROGS)/$$file; \
 	done
 	cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX)
 	$(STRIP) $(TINYX_BINX)/Xfbdev
@@ -126,12 +126,12 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
 #
 # After we have executables installed, install the libraries.
 $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
-	for dirs in $(TINYX_LIBS) ; do \
-		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
-		$(STRIP) --strip-unneeded $$file ; \
-		cp -f $$file $(TINYX_LIBX) ; \
-		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"` ; \
-		cp -pRf $$file $(TINYX_LIBX) ; \
+	for dirs in $(TINYX_LIBS); do \
+		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \
+		$(STRIP) --strip-unneeded $$file; \
+		cp -f $$file $(TINYX_LIBX); \
+		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \
+		cp -pRf $$file $(TINYX_LIBX); \
 	done
 
 tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk
index 2adea0ade..b9fe711c5 100644
--- a/package/tinyx/tinyx.mk
+++ b/package/tinyx/tinyx.mk
@@ -84,8 +84,8 @@ $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE)
 $(TINYX_XFBDEV): $(TINYX_DIR)/.configure
 	rm -f $(TINYX_BINX)/Xfbdev
 	#make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"
-	#( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
-	#( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
+	#( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" )
+	#( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
 	#
 	#mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx
 	#echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile
@@ -97,7 +97,7 @@ $(TINYX_XFBDEV): $(TINYX_DIR)/.configure
 	#echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile
 	#echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile
 	#cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile
-	( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
+	( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
 
 #
 # Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
@@ -114,9 +114,9 @@ $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
 $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
 	-mkdir $(TARGET_DIR)/usr/X11R6
 	-mkdir $(TINYX_BINX)
-	for file in $(TINYX_APPS) ; do \
-		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX) ; \
-		$(STRIP) $(TINYX_PROGS)/$$file ; \
+	for file in $(TINYX_APPS); do \
+		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \
+		$(STRIP) $(TINYX_PROGS)/$$file; \
 	done
 	cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX)
 	$(STRIP) $(TINYX_BINX)/Xfbdev
@@ -126,12 +126,12 @@ $(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
 #
 # After we have executables installed, install the libraries.
 $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
-	for dirs in $(TINYX_LIBS) ; do \
-		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
-		$(STRIP) --strip-unneeded $$file ; \
-		cp -f $$file $(TINYX_LIBX) ; \
-		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"` ; \
-		cp -pRf $$file $(TINYX_LIBX) ; \
+	for dirs in $(TINYX_LIBS); do \
+		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \
+		$(STRIP) --strip-unneeded $$file; \
+		cp -f $$file $(TINYX_LIBX); \
+		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \
+		cp -pRf $$file $(TINYX_LIBX); \
 	done
 
 tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 9f08f99be..241a021da 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -23,7 +23,7 @@ $(USBMOUNT_DIR)/.unpacked: $(DL_DIR)/$(USBMOUNT_SOURCE)
 
 $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked
 	$(INSTALL) -m 0755 -D $(USBMOUNT_DIR)/usbmount $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY)
-	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ] ; then \
+	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
 	        $(INSTALL) -m 0644 -D $(USBMOUNT_DIR)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
 	fi
 	touch -c $@
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 055400ff8..b5f41db01 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -52,8 +52,8 @@ vpnc: uclibc $(VPNC_TARGET_BINARY)
 vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
 
 vpnc-clean:
-	@if [ -d $(VPNC_DIR)/Makefile ] ; then \
-		$(MAKE) -C $(VPNC_DIR) clean ; \
+	@if [ -d $(VPNC_DIR)/Makefile ]; then \
+		$(MAKE) -C $(VPNC_DIR) clean; \
 	fi
 	rm -f $(STAGING_DIR)/usr/bin/vpnc
 
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index ad3dd35c6..476b9ed75 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -23,7 +23,7 @@ $(MESA3D_DIR)/.extracted: $(DL_DIR)/$(MESA3D_SOURCE)
 	touch $@
 
 $(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
-	( export $(TARGET_CONFIGURE_OPTS) ; \
+	( export $(TARGET_CONFIGURE_OPTS); \
 		echo "DRI_DIRS = $(MESA_DRIVERS)" && \
 		echo "OPT_FLAGS = $(TARGET_CFLAGS)" && \
 		echo "CC = $(TARGET_CC)" && \
@@ -39,7 +39,7 @@ $(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
 
 $(MESA3D_DIR)/.built: BR2_JLEVEL=1
 $(MESA3D_DIR)/.built: $(MESA3D_DIR)/.configured
-	gccinc=$$($(TARGET_CC) -print-search-dirs | grep '^install:' | sed 's@^install: @@')include ; \
+	gccinc=$$($(TARGET_CC) -print-search-dirs | grep '^install:' | sed 's@^install: @@')include; \
 	rm -f $(MESA3D_DIR)/config/current
 	env $(MESA_BUILD_ENV) $(MAKE) \
 		MKDEP="makedepend -I$$gccinc" \
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 2780c6365..5e06bc410 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -41,7 +41,7 @@ $(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched
 		--disable-IPv6 \
 		$(DISABLE_NLS) \
 		 \
-	);
+	)
 	touch $@
 
 $(XAPP_XMAN_DIR)/.built: $(XAPP_XMAN_DIR)/.configured
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 24a098d7b..3ae4410e4 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -41,7 +41,7 @@ $(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched
 		--disable-IPv6 \
 		$(DISABLE_NLS) \
 		 \
-	);
+	)
 	touch $@
 
 $(XDATA_XCURSOR_THEMES_DIR)/.built: $(XDATA_XCURSOR_THEMES_DIR)/.configured
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 4651ff220..4a6b7b38b 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -56,15 +56,15 @@ $(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured
 		LDFLAGS="-L$(E2FSPROGS_DIR)/lib" -C $(XFSPROGS_DIR)
 ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared)
 	( \
-		cd $(XFSPROGS_DIR) ; \
-		$(STRIP) $(XFSPROGS_STRIP) ; \
+		cd $(XFSPROGS_DIR); \
+		$(STRIP) $(XFSPROGS_STRIP); \
 		$(STRIP) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \
 				$(addprefix .libs/,$(notdir $(XFSPROGS_STRIP_LIBDEP)))) \
 	)
 	$(STRIP) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.*
 else
 	( \
-		cd $(XFSPROGS_DIR) ; \
+		cd $(XFSPROGS_DIR); \
 		$(STRIP) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \
 	)
 	$(STRIP) $(XFSPROGS_DIR)/lib*/lib*.so.*.*
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 3fe94fcba..45c7cf129 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -102,7 +102,7 @@ $(XORG_DIR)/.configured: $(XORG_DIR)/.unpacked
 
 $(XORG_XSERVER): $(XORG_DIR)/.configured
 	rm -f $(TARGET_XSERVER) $(XORG_XSERVER)
-	( cd $(XORG_DIR) ; $(MAKE) \
+	( cd $(XORG_DIR); $(MAKE) \
 		PKG_CONFIG=$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) \
 		World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
 	touch -c $(XORG_XSERVER)
@@ -122,17 +122,17 @@ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
 
 $(TARGET_XSERVER): $(XORG_XSERVER)
 	mkdir -p $(XORG_BINX)
-	for file in $(XORG_APPS) ; do \
-		cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX) ; \
-		chmod a+x $(XORG_PROGS)/$$file ; \
-		$(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \
+	for file in $(XORG_APPS); do \
+		cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX); \
+		chmod a+x $(XORG_PROGS)/$$file; \
+		$(STRIP) $(XORG_PROGS)/$$file || /bin/true; \
 	done
 	cp $(XORG_XSERVER) $(TARGET_XSERVER)
 	(cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X)
 	$(STRIP) $(TARGET_XSERVER)
 	mkdir -p $(XORG_LIBX)/modules
 	cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/
-	( cd $(XORG_DIR)/fonts ; $(MAKE) \
+	( cd $(XORG_DIR)/fonts; $(MAKE) \
 		DESTDIR=$(TARGET_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
 	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14.bdf $(XORG_LIBX)/X11/fonts/misc/
 	cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14-L1.bdf $(XORG_LIBX)/X11/fonts/misc/
@@ -188,16 +188,16 @@ $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked
 
 $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf
 	mkdir -p $(XORG_LIBX)
-	set -e; for dirs in $(XORG_LIBS) ; do \
-		file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \
-		$(STRIP) $(STRIP_STRIP_UNNEEDED) $$file ; \
-		cp -f $$file $(XORG_LIBX) ; \
-		file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"` ; \
-		cp -pRf $$file $(XORG_LIBX) ; \
+	set -e; for dirs in $(XORG_LIBS); do \
+		file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"`; \
+		$(STRIP) $(STRIP_STRIP_UNNEEDED) $$file; \
+		cp -f $$file $(XORG_LIBX); \
+		file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"`; \
+		cp -pRf $$file $(XORG_LIBX); \
 	done
 	(cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11)
 	touch $(TARGET_DIR)/etc/ld.so.conf
-	if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ] ; then \
+	if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ]; then \
 		echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \
 	fi
 	touch -c $(XORG_LIBX)/libX11.so.6.2
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index f2c46d03c..a70774280 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -23,7 +23,7 @@ $(ZLIB_DIR)/.patched: $(DL_DIR)/$(ZLIB_SOURCE)
 	touch $@
 
 $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
-	(cd $(ZLIB_DIR); rm -rf config.cache ; \
+	(cd $(ZLIB_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(ZLIB_CFLAGS)" \
diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk
index 91a9af2f2..180d43f72 100644
--- a/target/cloop/cloop.mk
+++ b/target/cloop/cloop.mk
@@ -74,7 +74,7 @@ check-tools:
 	- which symlinks
 
 clooproot: cloop check-tools $(IMAGE).cramfs ### cramfsroot
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/share/man
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 42c5aecad..24181d6b0 100644
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -37,7 +37,7 @@ cpioroot-init:
 	ln -s sbin/init $(TARGET_DIR)/init
 
 $(CPIO_BASE): host-fakeroot makedevs cpioroot-init
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 endif
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 3acc86a81..57170f731 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -21,7 +21,7 @@ $(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE)
 	toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs\*.patch
 
 $(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR)
-	$(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -C $(CRAMFS_DIR);
+	$(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -C $(CRAMFS_DIR)
 	touch -c $@
 
 cramfs: $(CRAMFS_DIR)/mkcramfs
@@ -48,8 +48,8 @@ endif
 CRAMFS_TARGET=$(IMAGE).cramfs
 
 cramfsroot: host-fakeroot makedevs cramfs
-	#-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	#-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 endif
diff --git a/target/device/AMD/DBAu1500/linux26.mk b/target/device/AMD/DBAu1500/linux26.mk
index 15678c0cb..347efd8bc 100644
--- a/target/device/AMD/DBAu1500/linux26.mk
+++ b/target/device/AMD/DBAu1500/linux26.mk
@@ -51,13 +51,13 @@ endif
 	touch $(LINUX26_DIR)/.unpacked
 
 $(LINUX26_KCONFIG):
-	@if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
+	@if [ ! -f "$(LINUX26_KCONFIG)" ]; then \
 		echo ""; \
 		echo "You should create a .config for your kernel"; \
 		echo "and install it as $(LINUX26_KCONFIG)"; \
 		echo ""; \
 		sleep 5; \
-	fi;
+	fi
 
 $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked
 	#toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR)
diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk
index 6a4d7780c..4a8967f37 100644
--- a/target/device/Atmel/u-boot/u-boot.mk
+++ b/target/device/Atmel/u-boot/u-boot.mk
@@ -212,7 +212,7 @@ uboot-new:
 UBOOT_TARGET:=$(IMAGE).uboot
 
 ubootroot: host-fakeroot makedevs uboot
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk
index 7b6567365..3fd52193e 100644
--- a/target/device/Sharp/LNode80/linux.mk
+++ b/target/device/Sharp/LNode80/linux.mk
@@ -71,13 +71,13 @@ endif
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_KCONFIG):
-	@if [ ! -f "$(LINUX_KCONFIG)" ] ; then \
+	@if [ ! -f "$(LINUX_KCONFIG)" ]; then \
 		echo ""; \
 		echo "You should create a .config for your kernel"; \
 		echo "and install it as $(LINUX_KCONFIG)"; \
 		echo ""; \
 		sleep 5; \
-	fi;
+	fi
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked  $(LINUX_KCONFIG)
 	$(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile
diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk
index a7363276b..bda61788b 100644
--- a/target/device/Soekris/net4521/linux.mk
+++ b/target/device/Soekris/net4521/linux.mk
@@ -72,13 +72,13 @@ endif
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_KCONFIG):
-	@if [ ! -f "$(LINUX_KCONFIG)" ] ; then \
+	@if [ ! -f "$(LINUX_KCONFIG)" ]; then \
 		echo ""; \
 		echo "You should create a .config for your kernel"; \
 		echo "and install it as $(LINUX_KCONFIG)"; \
 		echo ""; \
 		sleep 5; \
-	fi;
+	fi
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked  $(LINUX_KCONFIG)
 	$(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile
diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk
index e5b556972..0fdd7c004 100644
--- a/target/device/Via/epia-mii/linux.mk
+++ b/target/device/Via/epia-mii/linux.mk
@@ -61,7 +61,7 @@ endif
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_KCONFIG):
-	@if [ ! -f "$(LINUX_KCONFIG)" ] ; then \
+	@if [ ! -f "$(LINUX_KCONFIG)" ]; then \
 		echo ""; \
 		echo "You should create a .config for your kernel"; \
 		echo "and install it as $(LINUX_KCONFIG)"; \
@@ -69,7 +69,7 @@ $(LINUX_KCONFIG):
 		sleep 5; \
 		cd $(LINUX_DIR); \
 		$(MAKE) menuconfig; \
-	fi;
+	fi
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked  $(LINUX_KCONFIG)
 	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk
index 2685fbf19..8e74a308a 100644
--- a/target/device/jp/q5/linux.mk
+++ b/target/device/jp/q5/linux.mk
@@ -72,13 +72,13 @@ endif
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_KCONFIG):
-	@if [ ! -f "$(LINUX_KCONFIG)" ] ; then \
+	@if [ ! -f "$(LINUX_KCONFIG)" ]; then \
 		echo ""; \
 		echo "You should create a .config for your kernel"; \
 		echo "and install it as $(LINUX_KCONFIG)"; \
 		echo ""; \
 		sleep 5; \
-	fi;
+	fi
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked  $(LINUX_KCONFIG)
 	$(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 94f2456ce..099108161 100644
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -22,7 +22,7 @@ $(GENEXT2_DIR)/.configured: $(GENEXT2_DIR)/.unpacked
 		./configure \
 		CC="$(HOSTCC)" \
 		--prefix=$(STAGING_DIR) \
-	);
+	)
 	touch $@
 
 $(GENEXT2_DIR)/genext2fs: $(GENEXT2_DIR)/.configured
@@ -112,7 +112,7 @@ endif
 	# Use fakeroot so genext2fs believes the previous fakery
 ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
 	GENEXT2_REALSIZE=`LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
-	GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ] ; then echo 16384; else echo 2400; fi`; \
+	GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ]; then echo 16384; else echo 2400; fi`; \
 	GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \
 	GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \
 	GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \
diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk
index 936489c02..8dd75b5a5 100644
--- a/target/initramfs/initramfs.mk
+++ b/target/initramfs/initramfs.mk
@@ -15,7 +15,7 @@ endif
 $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs
 	rm -f $(TARGET_DIR)/init
 	ln -s sbin/init $(TARGET_DIR)/init
-	-find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	rm -rf $(TARGET_DIR)/usr/man
 endif
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index 1466a599d..4d468dcab 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -21,7 +21,7 @@ $(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE)
 
 $(MKISOFS_DIR)/.configured: $(MKISOFS_DIR)/.unpacked
 	(cd $(MKISOFS_DIR); rm -rf config.cache; \
-	);
+	)
 	touch  $(MKISOFS_DIR)/.configured
 
 $(MKISOFS_TARGET): $(MKISOFS_DIR)/.configured
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 869668bc8..bf54a5e4a 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -49,7 +49,7 @@ endif
 # just built.
 #
 $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/share/man
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 3fbdf9a4f..bb23c0e69 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -18,7 +18,7 @@ $(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH)
 	touch $@
 
 $(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked
-	$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools;
+	$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools
 
 squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs
 
@@ -44,7 +44,7 @@ endif
 SQUASHFS_TARGET:=$(IMAGE).squashfs
 
 squashfsroot: host-fakeroot makedevs squashfs
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 endif
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 4ac27575e..7adb1455f 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -23,7 +23,7 @@ TAR_COMPRESSOR_EXT:=lzma
 endif
 
 tarroot: host-fakeroot makedevs
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
 endif
diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk
index 126a5779a..89ef7645d 100644
--- a/target/x86/grub/grub.mk
+++ b/target/x86/grub/grub.mk
@@ -92,7 +92,7 @@ $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked
 		--infodir=/usr/info \
 		--disable-auto-linux-mem-opt \
 		$(GRUB_CONFIG-y) \
-	);
+	)
 	touch $@
 
 $(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured
diff --git a/target/x86/grub2/grub2.mk b/target/x86/grub2/grub2.mk
index 18a149d78..07d38af68 100644
--- a/target/x86/grub2/grub2.mk
+++ b/target/x86/grub2/grub2.mk
@@ -94,7 +94,7 @@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
 		--disable-auto-linux-mem-opt \
 		$(DISABLE_LARGEFILE) \
 		$(GRUB2_CONFIG-y) \
-	);
+	)
 	touch $@
 
 $(GRUB2_DIR)/$(GRUB2_BINARY): $(GRUB2_DIR)/.configured
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 9f1aef3a0..7d7fa7acb 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -99,7 +99,7 @@ $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
 
 $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
 	mkdir -p $(BINUTILS_DIR1)
-	(cd $(BINUTILS_DIR1); rm -rf config.cache ; \
+	(cd $(BINUTILS_DIR1); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		$(BINUTILS_DIR)/configure \
 		--prefix=$(BR2_SYSROOT_PREFIX)/usr \
@@ -149,7 +149,7 @@ binutils-dirclean:
 BINUTILS_DIR2:=$(BUILD_DIR)/binutils-$(BINUTILS_VERSION)-target
 $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched
 	mkdir -p $(BINUTILS_DIR2)
-	(cd $(BINUTILS_DIR2); rm -rf config.cache ; \
+	(cd $(BINUTILS_DIR2); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(BINUTILS_DIR)/configure \
 		--prefix=/usr \
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index 402b3d4b3..56723d777 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -84,18 +84,18 @@ ccache-clean:
 	rm -rf  $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 	rm -rf  $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc
 	rm -rf  $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
-	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ] ; then \
+	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ]; then \
 		mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \
 		(cd $(STAGING_DIR)/usr/bin; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \
 		    ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \
 	fi
-	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \
+	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ]; then \
 		rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \
 		mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \
 	fi
-	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \
+	if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ]; then \
 		rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \
 		mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++  $(STAGING_DIR)/usr/bin/; \
 	fi
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index b643b92fc..582b15749 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -30,10 +30,10 @@ copy_toolchain_lib_root =									\
 				cp $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB};	\
 				case "$${STRIP}" in						\
 				(0 | n | no)							\
-					;;							\
+;;							\
 				(*)								\
 					$(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}";		\
-					;;							\
+;;							\
 				esac;								\
 			else									\
 				exit -1;							\
@@ -51,6 +51,6 @@ $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))):
 	mkdir -p $(TARGET_DIR)/lib
 	@$(call copy_toolchain_lib_root, $(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))), /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP))
 #")))
-	for libs in $(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIBS))) ; do \
-		$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)) ; \
+	for libs in $(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIBS))); do \
+		$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
 	done
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index db85468b9..b365dbc60 100644
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -228,7 +228,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
 	#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
 	#ln -snf ../lib/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
-	(cd $(GCC_BUILD_DIR2); rm -rf config.cache ; \
+	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		LDFLAGS_FOR_TARGET="$(patsubst %,LDFLAGS+=-Wl$(comma)%,$(TARGET_LDFLAGS)) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		$(GCC_DIR)/configure \
@@ -259,31 +259,31 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
 
 $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install
-	if [ -d "$(STAGING_DIR)/usr/lib64" ] ; then \
-		if [ ! -e "$(STAGING_DIR)/usr/lib" ] ; then \
-			mkdir "$(STAGING_DIR)/usr/lib" ; \
-		fi ; \
-		mv "$(STAGING_DIR)/usr/lib64/"* "$(STAGING_DIR)/usr/lib/" ; \
-		rmdir "$(STAGING_DIR)/usr/lib64" ; \
+	if [ -d "$(STAGING_DIR)/usr/lib64" ]; then \
+		if [ ! -e "$(STAGING_DIR)/usr/lib" ]; then \
+			mkdir "$(STAGING_DIR)/usr/lib"; \
+		fi; \
+		mv "$(STAGING_DIR)/usr/lib64/"* "$(STAGING_DIR)/usr/lib/"; \
+		rmdir "$(STAGING_DIR)/usr/lib64"; \
 	fi
 	# Strip the host binaries
 ifeq ($(GCC_STRIP_HOST_BINARIES),true)
 	-strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/*
 endif
 	# Make sure we have 'cc'.
-	if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \
+	if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \
 		ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
-			$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \
+			$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
 	fi
-	if [ ! -e $(STAGING_DIR)/usr/bin/gcc ] ; then \
-		ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \
+	if [ ! -e $(STAGING_DIR)/usr/bin/gcc ]; then \
+		ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
 	fi
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
 	(cd $(STAGING_DIR)/usr; \
 		ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
 		cd bin; \
-		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
+		for app in $(REAL_GNU_TARGET_NAME)-*; do \
 			ln -snf $${app} \
 		   	$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
 		done; \
@@ -294,14 +294,14 @@ endif
 ifeq ($(BR2_SOFT_FLOAT),y)
 ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
 	# Make sure we have a soft float specs file for this arch
-	if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \
-		echo soft float configured but no specs file for this arch ; \
-		/bin/false ; \
+	if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \
+		echo soft float configured but no specs file for this arch; \
+		/bin/false; \
 	fi
 	# Replace specs file with one that defaults to soft float mode.
-	if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \
-		echo staging dir specs file is missing ; \
-		/bin/false ; \
+	if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ]; then \
+		echo staging dir specs file is missing; \
+		/bin/false; \
 	fi
 	cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
 endif
@@ -361,7 +361,7 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER
 	touch $@
 
 $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
-	(cd $(GCC_BUILD_DIR3); rm -rf config.cache ; \
+	(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \
 		$(TARGET_GCC_FLAGS) \
@@ -446,14 +446,14 @@ endif
 	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	# Work around problem of missing syslimits.h
-	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ] ; then \
-		echo "warning: working around missing syslimits.h" ; \
+	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \
+		echo "warning: working around missing syslimits.h"; \
 		cp -f $(STAGING_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h \
-			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/ ; \
+			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \
 	fi
 	# Make sure we have 'cc'.
-	if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \
-		ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \
+	if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
+		ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
 	fi
 	# These are in /lib, so...
 	#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index e91275789..eea12895e 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -186,7 +186,7 @@ GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial
 
 $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 	mkdir -p $(GCC_BUILD_DIR1)
-	(cd $(GCC_BUILD_DIR1); rm -rf config.cache ; \
+	(cd $(GCC_BUILD_DIR1); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		$(GCC_DIR)/configure \
 		--prefix=$(STAGING_DIR)/usr \
@@ -246,7 +246,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
 	#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
 	#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
-	(cd $(GCC_BUILD_DIR2); rm -rf config.cache ; \
+	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		$(GCC_DIR)/configure \
 		--prefix=$(BR2_SYSROOT_PREFIX)/usr \
@@ -279,12 +279,12 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
 $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
 	PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \
 		-C $(GCC_BUILD_DIR2) install
-	if [ -d "$(STAGING_DIR)/lib64" ] ; then \
-		if [ ! -e "$(STAGING_DIR)/lib" ] ; then \
-			mkdir "$(STAGING_DIR)/lib" ; \
-		fi ; \
-		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/" ; \
-		rmdir "$(STAGING_DIR)/lib64" ; \
+	if [ -d "$(STAGING_DIR)/lib64" ]; then \
+		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
+			mkdir "$(STAGING_DIR)/lib"; \
+		fi; \
+		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
+		rmdir "$(STAGING_DIR)/lib64"; \
 	fi
 	# Move gcc bug reporting script out of path of real executables
 	mv -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gccbug \
@@ -295,19 +295,19 @@ ifeq ($(GCC_STRIP_HOST_BINARIES),true)
 	-strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/faked
 endif
 	# Make sure we have 'cc'.
-	if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \
+	if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \
 		ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
-			$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \
+			$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
 	fi
-	if [ ! -e $(STAGING_DIR)/usr/bin/cc ] ; then \
-		ln -snf gcc $(STAGING_DIR)/usr/bin/cc ; \
+	if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
+		ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
 	fi
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
 	(cd $(STAGING_DIR); \
 		ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
 		cd usr/bin; \
-		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
+		for app in $(REAL_GNU_TARGET_NAME)-*; do \
 			ln -snf $${app} \
 			$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
 		done; \
@@ -318,14 +318,14 @@ endif
 ifeq ($(BR2_SOFT_FLOAT),y)
 ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
 	# Make sure we have a soft float specs file for this arch
-	if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \
-		echo soft float configured but no specs file for this arch ; \
-		/bin/false ; \
+	if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \
+		echo soft float configured but no specs file for this arch; \
+		/bin/false; \
 	fi
 	# Replace specs file with one that defaults to soft float mode.
-	if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \
-		echo staging dir specs file is missing ; \
-		/bin/false ; \
+	if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ]; then \
+		echo staging dir specs file is missing; \
+		/bin/false; \
 	fi
 	cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
 endif
@@ -383,7 +383,7 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER
 	touch $@
 
 $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
-	(cd $(GCC_BUILD_DIR3); rm -rf config.cache ; \
+	(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_GCC_FLAGS) \
 		$(GCC_DIR)/configure \
@@ -467,14 +467,14 @@ endif
 	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	# Work around problem of missing syslimits.h
-	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ] ; then \
-		echo "warning: working around missing syslimits.h" ; \
+	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \
+		echo "warning: working around missing syslimits.h"; \
 		cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/include/syslimits.h \
-			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/ ; \
+			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \
 	fi
 	# Make sure we have 'cc'.
-	if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \
-		ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \
+	if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
+		ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
 	fi
 	# These are in /lib, so...
 	#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 44250e09b..6486f874b 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -88,7 +88,7 @@ GDB_TARGET_CONFIGURE_VARS:= \
 
 $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
 	mkdir -p $(GDB_TARGET_DIR)
-	(cd $(GDB_TARGET_DIR); rm -rf config.cache ; \
+	(cd $(GDB_TARGET_DIR); rm -rf config.cache; \
 		gdb_cv_func_sigsetjmp=yes \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -Wno-error" \
@@ -139,7 +139,7 @@ GDB_SERVER_DIR:=$(BUILD_DIR)/gdbserver-$(GDB_VERSION)
 
 $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
 	mkdir -p $(GDB_SERVER_DIR)
-	(cd $(GDB_SERVER_DIR); rm -rf config.cache ; \
+	(cd $(GDB_SERVER_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		gdb_cv_func_sigsetjmp=yes \
 		bash_cv_have_mbstate_t=yes \
@@ -195,7 +195,7 @@ GDB_HOST_DIR:=$(TOOL_BUILD_DIR)/gdbhost-$(GDB_VERSION)
 
 $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
 	mkdir -p $(GDB_HOST_DIR)
-	(cd $(GDB_HOST_DIR); rm -rf config.cache ; \
+	(cd $(GDB_HOST_DIR); rm -rf config.cache; \
 		gdb_cv_func_sigsetjmp=yes \
 		bash_cv_have_mbstate_t=yes \
 		$(GDB_DIR)/configure \
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 28e1c7609..83577d33d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -290,17 +290,17 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
 		pregen install_dev
 	# Install the kernel headers to the first stage gcc include dir if necessary
 ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
-	if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ] ; \
+	if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ]; \
 	then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \
 	fi
 else
-	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
-		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \
+		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \
 			cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
-				$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
+				$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \
 		fi; \
 	fi
 endif
@@ -342,17 +342,17 @@ else
 endif
 	# Install the kernel headers to the staging dir if necessary
 ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
-	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/ ; \
+	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/; \
 	fi
 else
 
-	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/usr/include/ ; \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/usr/include/ ; \
-		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/usr/include/; \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/usr/include/; \
+		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \
 			cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
-				$(STAGING_DIR)/usr/include/ ; \
+				$(STAGING_DIR)/usr/include/; \
 		fi; \
 	fi
 endif
@@ -427,17 +427,17 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
 		install_dev
 	# Install the kernel headers to the target dir if necessary
 ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
-	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; \
+	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; \
 	then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/ ; \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/; \
 	fi
 else
-	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/ ; \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/ ; \
-		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
+	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; then \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/; \
+		cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/; \
+		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \
 			cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \
-				$(TARGET_DIR)/usr/include/ ; \
+				$(TARGET_DIR)/usr/include/; \
 		fi; \
 	fi
 endif