Index: user/Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- user/Makefile	21 Aug 2006 15:51:50 -0000	1.17
+++ user/Makefile	3 Sep 2006 16:48:24 -0000
@@ -201,6 +201,7 @@
 dir_$(CONFIG_USER_MP3PLAY_MP3PLAY)          += mp3play
 dir_$(CONFIG_USER_MSNTP_MSNTP)              += msntp
 dir_$(CONFIG_USER_MUSICBOX_MUSICBOX)        += musicbox
+dir_$(CONFIG_USER_MUTT)                     += mutt
 dir_$(CONFIG_USER_MYSQL)                    += mysql
 dir_$(CONFIG_USER_NANO)                     += nano
 dir_$(CONFIG_USER_NESSUS_NASL)              += nessus
@@ -392,19 +393,33 @@
 	for i in $(sort $(dir_y)) $(dir_v) $(dir_p); do \
 		if [ -d $$i ]; then \
 			touch $$i/.sgbuilt_user; \
-			make -C $$i || exit $$? ; \
+			if [ -f $$i/Makefile.uClinux ]; then \
+				make -C $$i -f Makefile.uClinux || exit $$?; \
+			else \
+				make -C $$i  || exit $$? ; \
+			fi; \
 		fi; \
 	done
 
 romfs:
 	for i in $(sort $(dir_y)) $(dir_p) ; do \
-		[ ! -d $$i ] || make -C $$i romfs || exit $$? ; \
+		if [ -d $$i ]; then \
+			if [ -f $$i/Makefile.uClinux ]; then \
+				make -C $$i -f Makefile.uClinux romfs || exit $$?; \
+			else \
+				make -C $$i romfs || exit $$? ; \
+			fi; \
+		fi; \
 	done
 
 clean:
 	-for i in $(dir_v) $(sort $(dir_y) $(dir_n) $(dir_)) $(dir_p) ; do \
 		if [ -f $$i/.sgbuilt_user ]; then \
-			make -C $$i clean ; \
+			if [ -f $$i/Makefile.uClinux ]; then \
+				make -C $$i -f Makefile.uClinux clean; \
+			else \
+				make -C $$i clean ; \
+			fi; \
 			rm -f $$i/.sgbuilt_user; \
 		fi; \
 	done