* Fixes when disks-$ARCH is missing as is the case currently with sarge.
* Manages new debian-faq.en.html.tar.gz (instead of debian-faq.html.tar.gz)
This commit is contained in:
parent
0b07e43e17
commit
ad275da746
8
Makefile
8
Makefile
|
@ -572,8 +572,11 @@ $(BDIR)/CD1/doc:
|
||||||
@for DISK in $(FIRSTDISKS) ; do \
|
@for DISK in $(FIRSTDISKS) ; do \
|
||||||
mkdir $(BDIR)/$$DISK/doc/FAQ/html ; \
|
mkdir $(BDIR)/$$DISK/doc/FAQ/html ; \
|
||||||
cd $(BDIR)/$$DISK/doc/FAQ/html ; \
|
cd $(BDIR)/$$DISK/doc/FAQ/html ; \
|
||||||
|
if [ -e "../debian-faq.en.html.tar.gz" ]; then \
|
||||||
|
tar xzvf ../debian-faq.en.html.tar.gz ; \
|
||||||
|
else \
|
||||||
tar xzvf ../debian-faq.html.tar.gz ; \
|
tar xzvf ../debian-faq.html.tar.gz ; \
|
||||||
rm -f ../debian-faq.html.tar.gz ; \
|
fi; \
|
||||||
done
|
done
|
||||||
$(Q)$(add_bin_doc) # Common stuff for all disks
|
$(Q)$(add_bin_doc) # Common stuff for all disks
|
||||||
|
|
||||||
|
@ -622,6 +625,9 @@ $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
|
||||||
$(Q)set -e; \
|
$(Q)set -e; \
|
||||||
for DISK in $(FIRSTDISKS) ; do \
|
for DISK in $(FIRSTDISKS) ; do \
|
||||||
mkdir -p $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) ; \
|
mkdir -p $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) ; \
|
||||||
|
if [ ! -e "$(BOOTDISKS)" ]; then \
|
||||||
|
break; \
|
||||||
|
done; \
|
||||||
$(add_files) \
|
$(add_files) \
|
||||||
$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
|
$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
|
||||||
$(BOOTDISKS) . ; \
|
$(BOOTDISKS) . ; \
|
||||||
|
|
Loading…
Reference in New Issue