Changeset 6dfcfecc for Makefile

Timestamp:

03/31/2021 10:41:39 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

7610848

Parents:

811b5a39

git-author:

Thomas Trepl <thomas@…> (06/29/2020 07:55:01 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:39 AM)

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -27 +27 @@
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
-  DUMPDIR         ?= ~/lfs-commands
+  DUMPDIR         ?= ~/cross-lfs-commands
 else
   BASEDIR         ?= ~/lfs-systemd
@@ -60 +60 @@
         $(Q)mkdir -p $(BASEDIR)/stylesheets
         $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-        $(Q)pushd $(BASEDIR)/ > /dev/null;                     \
-#       sed -i -e "s@../stylesheets@stylesheets@g" *.html; \
-       popd > /dev/null
 
         $(Q)mkdir -p $(BASEDIR)/images
@@ -176 +173 @@
 #       $(Q)xsltproc --nonet --xinclude                    \
 #                --stringparam profile.revision $(REV) \
-#                --stringparam profile.arch $(ARCH)    \
 #                --output $(RENDERTMP)/sysd-wget.xml   \
 #                stylesheets/lfs-xsl/profile.xsl       \
@@ -194 +190 @@
         $(Q)xsltproc --nonet --xinclude                    \
                 --stringparam profile.revision $(REV) \
-                --stringparam profile.arch $(ARCH) \
+                --stringparam profile.arch $(ARCH)    \
                 --output $(RENDERTMP)/sysv-md5sum.xml \
                 stylesheets/lfs-xsl/profile.xsl       \
@@ -212 +208 @@
 #      --output $(RENDERTMP)/lfs-html.xml    \
 #      --stringparam profile.revision $(REV) \
-#      --stringparam profile.arch $(ARCH)    \
 #      stylesheets/lfs-xsl/profile.xsl       \
 #      $(RENDERTMP)/lfs-full.xml