Fix preprocess of exclude files when EXCLUDE is not set.

This commit is contained in:
Otavio Salvador 2004-05-12 18:19:27 +00:00
parent 79556acf0c
commit 42f052f0c1
2 changed files with 4 additions and 1 deletions

View File

@ -363,12 +363,14 @@ endif
# Build the raw list (cpp output) with doubles and spaces for excluded packages
$(BDIR)/rawlist-exclude:
$(Q)if [ -n $(EXCLUDE) ]; then \
$(Q)if [ -n "$(EXCLUDE)" ]; then \
perl -npe 's/\@ARCH\@/$(ARCH)/g' $(EXCLUDE) | \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
-U $(ARCH) -U i386 -U linux -U unix \
-DFORCENONUSONCD1=$(forcenonusoncd1) \
-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \
else \
echo > $(BDIR)/rawlist-exclude; \
fi
## DIRECTORIES && PACKAGES && INFOS ##

1
debian/changelog vendored
View File

@ -70,6 +70,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
- Preprocess exclude files much like tasks files are. Closes: #247379
- Check if the missing debootstrap-required is not included on
base_exclude.
- Fix preprocess of exclude files when EXCLUDE is not set.
-- Raphael Hertzog <hertzog@debian.org> Thu, 25 Mar 2004 07:33:23 +0100