* debian/rules removes unneeded CVS directories.

* corrected a litlle quoting problem in the Makefile.
* removed NONUS=0 from the example in the README

Makefile

@@ -404,14 +404,14 @@ bin-extras: ok
 	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
 	  false; \
 	fi
-	@echo "Adding dirs `$(DIR)' from `$(ROOTSRC)' to `$(BDIR)/$(CD)'" ...
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(BDIR)/$(CD)'" ...
 	@$(addfiles) $(BDIR)/$(CD) $(ROOTSRC) $(DIR)
 src-extras:
 	@if [ -z "$(DIR)" -o -z "$(CD)" -o -z "$(ROOTSRC)" ]; then \
 	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
 	  false; \
 	fi
-	@echo "Adding dirs `$(DIR)' from `$(ROOTSRC)' to `$(SDIR)/$(CD)'" ...
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(SDIR)/$(CD)'" ...
 	@$(addfiles) $(SDIR)/$(CD) $(ROOTSRC) $(DIR)
 
 ## IMAGE BUILDING ##

README

@@ -78,8 +78,9 @@ The process of building a CD is decomposed as follow :
   $ make list TASK=tasks/gnome COMPLETE=0 SIZELIMIT=576716800
   or
   $ export NONFREE=1; make list TASK=tasks/kde COMPLETE=1
-  or for something like an official image for the USA :
-  $ make COMPLETE=1 NONUS=0 NONFREE=0 SIZELIMIT1=576716800
+  or for something like an official image for the USA (without non-US &
+  non-free) :
+  $ make COMPLETE=1 SIZELIMIT1=576716800
   .... take a look at the file tasks/* to see the options you can have :)
   
   You can change the behaviour of this command with the following

debian/rules

@@ -41,6 +41,7 @@ install-stamp: build-stamp
 	cp debian/CONF.sh debian/debian-cd/etc/debian-cd/conf.sh
 	ln -sf /etc/debian-cd/conf.sh \
                debian/debian-cd/usr/share/debian-cd/CONF.sh
+	find debian/debian-cd -name 'CVS' | xargs -r rm -rf
 	
 
 	touch install-stamp