* debian/rules removes unneeded CVS directories.

* corrected a litlle quoting problem in the Makefile.
* removed NONUS=0 from the example in the README
This commit is contained in:
Raphaël Hertzog 1999-12-21 17:20:30 +00:00
parent 42e9e79fa7
commit 9c1d1aa4b5
3 changed files with 6 additions and 4 deletions

View File

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

5
README
View File

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

1
debian/rules vendored
View File

@ -41,6 +41,7 @@ install-stamp: build-stamp
cp debian/CONF.sh debian/debian-cd/etc/debian-cd/conf.sh cp debian/CONF.sh debian/debian-cd/etc/debian-cd/conf.sh
ln -sf /etc/debian-cd/conf.sh \ ln -sf /etc/debian-cd/conf.sh \
debian/debian-cd/usr/share/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 touch install-stamp