Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2021-08-22 05:45:22 +02:00
commit 69d280f4ba
2 changed files with 2 additions and 1 deletions

View File

@ -59,6 +59,7 @@ book: validate profile-html
@echo "Copying CSS code and images..." @echo "Copying CSS code and images..."
$(Q)mkdir -p $(BASEDIR)/stylesheets $(Q)mkdir -p $(BASEDIR)/stylesheets
$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
$(Q)mkdir -p $(BASEDIR)/images $(Q)mkdir -p $(BASEDIR)/images
$(Q)cp images/*.png $(BASEDIR)/images $(Q)cp images/*.png $(BASEDIR)/images

View File

@ -86,7 +86,7 @@ find /usr/lib{,x}32 -name \*.la -delete</userinput></screen>
backed up for later reuse. In case of fatal failures in the subsequent backed up for later reuse. In case of fatal failures in the subsequent
chapters, it often turns out that removing everything and starting over chapters, it often turns out that removing everything and starting over
(more carefully) is the best option to recover. Unfortunately, all the (more carefully) is the best option to recover. Unfortunately, all the
the temporary files will be removed, too. To avoid spending extra time to temporary files will be removed, too. To avoid spending extra time to
redo something which has been built successfully, prepare a backup. redo something which has been built successfully, prepare a backup.
</para> </para>