r1858

dslinux_amadeus at dslinux.in-berlin.de dslinux_amadeus at dslinux.in-berlin.de
Fri Aug 24 23:45:12 CEST 2007


Author: amadeus
Date: 2007-08-24 23:45:06 +0200 (Fri, 24 Aug 2007)
New Revision: 1858

Log:
Improve Makefile

Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile	2007-08-24 21:43:47 UTC (rev 1857)
+++ trunk/lib/Makefile	2007-08-24 21:45:06 UTC (rev 1858)
@@ -105,10 +105,10 @@
 		if [ -d $$i ]; then \
 			if [ "$$i" = "libncurses" ]; then \
 				touch $$i/.sgbuilt_lib; \
-				make -C $$i AWK=awk || exit $$?; \
+				$(MAKE) -C $$i AWK=awk || exit $$?; \
 			else \
 				touch $$i/.sgbuilt_lib; \
-				make -C $$i || exit $$? ; \
+				$(MAKE) -C $$i || exit $$? ; \
 			fi; \
 		fi; \
 		$(MAKE) make_links || exit $? ; \
@@ -125,7 +125,7 @@
 	$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD -s config/resolv.conf /etc/resolv.conf
 	$(ROMFSINST) -e CONFIG_USER_FLATFSD_FLATFSD -e CONFIG_USER_TINYLOGIN_SHADOWPASSWDS -s config/shadow /etc/shadow
 	for i in $(dir_y) ; do \
-		[ ! -d $$i ] || make -C $$i romfs || exit $$? ; \
+		[ ! -d $$i ] || $(MAKE) -C $$i romfs || exit $$? ; \
 	done
 
 ##############################################################################
@@ -133,7 +133,7 @@
 clean: clean_links
 	-for i in $(dir_y) $(dir_n) $(dir_); do \
 		if [ -f $$i/.sgbuilt_lib ]; then \
-			make -C $$i clean ; \
+			$(MAKE) -C $$i clean ; \
 			rm -f $$i/.sgbuilt_lib; \
 		fi; \
 	done




More information about the dslinux-commit mailing list