gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify the writing of sed's in Makefile

Browse Source 
also remove a commented out line

Part of a patch by Boian Berberov
This commit is contained in:
Pierre Labastie 2024-01-27 16:56:22 +01:00
parent 0d80918aec
commit 4ac089b5b2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -44,7 +44,8 @@ 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)sed -e 's|../stylesheet|stylesheet|' \
-i $(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
@ -54,9 +55,9 @@ book: validate profile-html
tidy -config tidy.conf $$filename; \ tidy -config tidy.conf $$filename; \
true; \ true; \
/bin/bash obfuscate.sh $$filename; \ /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; \ -i $$filename; \
done; done
$(Q)$(MAKE) --no-print-directory wget-list md5sums $(Q)$(MAKE) --no-print-directory wget-list md5sums
@ -95,16 +96,16 @@ nochunks: validate profile-html
--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \ --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
stylesheets/lfs-nochunks.xsl \ stylesheets/lfs-nochunks.xsl \
$(RENDERTMP)/lfs-html.xml $(RENDERTMP)/lfs-html.xml
# $(RENDERTMP)/lfs-html2.xml
@echo "Running Tidy..." @echo "Running Tidy..."
$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@echo "Running obfuscate.sh..." @echo "Running obfuscate.sh..."
$(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -e "s|text/html|application/xhtml+xml|g" \
$(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) -e "s|../wget-list|wget-list|" \
$(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) -e "s|../md5sums|md5sums|" \
-i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"