Author: pierre
Date: Tue Jan 5 08:08:25 2021
New Revision: 12089
Log:
Remove stylesheets and fix Makefile
Deleted:
branches/editor-manual-git/stylesheets/
Modified:
branches/editor-manual-git/Makefile
branches/editor-manual-git/chapter01/changelog.xml
Modified: branches/editor-manual-git/Makefile
==============================================================================
--- branches/editor-manual-git/Makefile Tue Jan 5 07:22:37 2021 (r12088)
+++ branches/editor-manual-git/Makefile Tue Jan 5 08:08:25 2021 (r12089)
@@ -2,21 +2,22 @@
CHUNK_QUIET=1
PDF_OUTPUT=LFS-EDITORS-GUIDE.pdf
NOCHUNKS_OUTPUT=LFS-EDITORS-GUIDE.html
-XSLROOTDIR=/usr/share/xml/docbook/stylesheet/docbook-xsl
+LFSTRUNK=../BOOK
+LFSXSL=$(LFSTRUNK)/stylesheets
lfs:
xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
- -stringparam base.dir $(BASEDIR)/ ../BOOK/stylesheets/lfs-chunked.xsl
index.xml
+ -stringparam base.dir $(BASEDIR)/ $(LFSXSL)/lfs-chunked.xsl index.xml
if [ ! -e $(BASEDIR)/stylesheets ]; then \
mkdir -p $(BASEDIR)/stylesheets; \
fi;
- cp ../BOOK/stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+ cp ../BOOK/$(LFSXSL)/lfs-xsl/*.css $(BASEDIR)/stylesheets
if [ ! -e $(BASEDIR)/images ]; then \
mkdir -p $(BASEDIR)/images; \
fi;
- cp ../BOOK/images/*.png \
+ cp $(LFSTRUNK)/images/*.png \
$(BASEDIR)/images
cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
*.html
@@ -34,15 +35,15 @@
pdf:
xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
- stylesheets/lfs-pdf.xsl index.xml
+ $(LFSXSL)/lfs-pdf.xsl index.xml
sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
- fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+ fop $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
rm $(BASEDIR)/lfs-pdf.fo
nochunks:
xsltproc --xinclude --nonet -stringparam profile.condition html \
--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
- stylesheets/lfs-nochunks.xsl index.xml
+ $(LFSXSL)/lfs-nochunks.xsl index.xml
tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
Modified: branches/editor-manual-git/chapter01/changelog.xml
==============================================================================
--- branches/editor-manual-git/chapter01/changelog.xml Tue Jan 5 07:22:37
2021 (r12088)
+++ branches/editor-manual-git/chapter01/changelog.xml Tue Jan 5 08:08:25
2021 (r12089)
@@ -24,10 +24,28 @@
</listitem>
<listitem><para>Removed:</para>
+ <itemizedlist>
+ <listitem><para>Removed Stylesheets.</para></listitem>
+ </itemizedlist>
</listitem>
<listitem><para>Changelog Entries:</para>
<itemizedlist>
+ <listitem><para>January 5, 2021 [pierre]</para>
+ <itemizedlist>
+ <listitem>
+ <para>Stylesheets: Remove and use those of the lfs book.</para>
+ </listitem>
+ <listitem>
+ <para>Makefile: Create variables so that using a local layout is
+ easier. Also fix some obsolete commands.</para>
+ </listitem>
+ <listitem>
+ <para>Chapter 2: Change filenames, rewrite things so that the
+ commands refer to git instead of svn. Also fix hostnames.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem><para>January 4, 2021 [pierre]</para>
<itemizedlist>
<listitem>
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
