Changeset 4ac089b5 for Makefile

Timestamp:

01/27/2024 09:41:48 PM (8 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, 12.1-rc1, 12.2, 12.2-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/update-glibc

Children:

16d0182

Parents:

0d80918a

git-author:

Pierre Labastie <pierre.labastie@…> (01/27/2024 03:56:22 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (01/27/2024 09:41:48 PM)

Message:

Unify the writing of sed's in Makefile

also remove a commented out line

Part of a patch by Boian Berberov

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -45 +45 @@
         $(Q)mkdir -p $(BASEDIR)/stylesheets
         $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-        $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
+        $(Q)sed -e 's|../stylesheet|stylesheet|' \
+           -i $(BASEDIR)/index.html
 
         $(Q)mkdir -p $(BASEDIR)/images
@@ -55 +56 @@
          true;                                        \
          /bin/bash obfuscate.sh $$filename;           \
-         sed -e "s@text/html@application/xhtml+xml@g" \
+         sed -e "s|text/html|application/xhtml+xml|g" \
              -i $$filename;                           \
-   done;
+       done
 
         $(Q)$(MAKE) --no-print-directory wget-list md5sums
@@ -96 +97 @@
                 stylesheets/lfs-nochunks.xsl           \
                 $(RENDERTMP)/lfs-html.xml
-#                $(RENDERTMP)/lfs-html2.xml
 
         @echo "Running Tidy..."
@@ -102 +102 @@
 
         @echo "Running obfuscate.sh..."
-        $(Q)bash obfuscate.sh                                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(Q)sed -i -e "s@../wget-list@wget-list@"            $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(Q)sed -i -e "s@../md5sums@md5sums@"                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)bash obfuscate.sh      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)sed -e "s|text/html|application/xhtml+xml|g" \
+           -e "s|../wget-list|wget-list|"           \
+           -e "s|../md5sums|md5sums|"               \
+           -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
         @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"