FSFE/fsfe-website
28
32
Fork 93
Code Issues 64 Pull Requests 13 Wiki Activity

Improve default part of makefile
All checks were successful
the build was successful
Details

Browse Source 
The comma in "\$(file >manifest,)" avoids a segfault with GNU Make 4.0
This commit is contained in:
Reinhard Müller
2019-03-09 20:55:42 +01:00
parent 40e85d3e09
commit 4d1c998d35
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/makerules.sh
View File

@@ -226,6 +226,7 @@ tree_maker(){
cat <<MakeHead
.PHONY: all
.DELETE_ON_ERROR:
PROCESSOR = "$basedir/build/process_file.sh"
PROCFLAGS = --source "$basedir" --statusdir "$statusdir" --domain "$domain"
INPUTDIR = $input
@@ -333,19 +334,20 @@ SOURCE_DST_FILES := \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/source/%,\$(HTML_SR
# Clean up excess files in target directory
# -----------------------------------------------------------------------------
ALL_TARGETS := \$(HTML_DST_FILES) \$(HTML_DST_LINKS) \$(INDEX_DST_LINKS) \$(RSS_DST_FILES) \$(ICS_DST_FILES) \$(COPY_DST_FILES) \$(SOURCE_DST_FILES)
ALL_DST := \$(HTML_DST_FILES) \$(HTML_DST_LINKS) \$(INDEX_DST_LINKS) \$(RSS_DST_FILES) \$(ICS_DST_FILES) \$(COPY_DST_FILES) \$(SOURCE_DST_FILES)
.PHONY: clean
all: clean
clean:
@echo "Cleaning up excess files"
\$(file >manifest)
\$(foreach filename,\$(ALL_TARGETS),\$(file >>manifest,\$(filename)))
@# Write all destination filenames into "manifest" file, one per line
\$(file >manifest,)
\$(foreach filename,\$(ALL_DST),\$(file >>manifest,\$(filename)))
@sort manifest > manifest.sorted
@find -L \$(OUTPUTDIR) -type f \
| sort \
| diff - manifest.sorted \
| sed -rn 's;^< ;;p' \
@find -L \$(OUTPUTDIR) -type f \\
| sort \\
| diff - manifest.sorted \\
| sed -rn 's;^< ;;p' \\
| while read file; do echo "* Deleting \$\${file}"; rm "\$\${file}"; done
# -----------------------------------------------------------------------------