Files
extra/freedoom/fix-errors.patch
2025-06-22 20:39:04 -05:00

70 lines
3.3 KiB
Diff

--- a/Makefile 2024-01-30 00:21:55.000000000 +0100
+++ b/Makefile 2024-02-02 17:27:27.945732689 +0100
@@ -13,8 +13,6 @@
NODE_BUILDER_LEVELS=e?m? dm?? map??
LEGACY_TRANSPARENCY_INDEX=255
LEGACY_TRANSPARENCY_REPLACEMENT=133
-MANUAL_ADOC_FILES=$(wildcard manual/freedoom-manual-??.adoc)
-MANUAL_PDF_FILES=$(subst .adoc,.pdf,$(MANUAL_ADOC_FILES))
FREEDOOM1=$(WADS)/freedoom1.wad
FREEDOOM2=$(WADS)/freedoom2.wad
@@ -117,7 +115,7 @@
HTMLDOCS=NEWS.html README.html
TEXTDOCS=COPYING.txt CREDITS.txt CREDITS-MUSIC.txt
-DISTDOCS=$(HTMLDOCS) $(TEXTDOCS) $(MANUAL_PDF_FILES)
+DISTDOCS=$(HTMLDOCS) $(TEXTDOCS)
dist: $(OBJS) $(DISTDOCS)
LC_ALL=C VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
@@ -251,7 +249,7 @@
waddir?=/share/games/doom
target=$(DESTDIR)$(prefix)
-install-freedm: $(FREEDM) $(HTMLDOCS) $(MANUAL_PDF_FILES) \
+install-freedm: $(FREEDM) $(HTMLDOCS) \
freedm.6 io.github.freedoom.FreeDM.png
install -Dm 644 dist/io.github.freedoom.FreeDM.desktop \
-t "$(target)/share/applications"
@@ -264,10 +262,9 @@
-t "$(target)/share/icons"
install -Dm 644 CREDITS CREDITS-MUSIC NEWS.html README.html -t "$(target)$(docdir)/freedm"
install -Dm 644 COPYING.adoc "$(target)$(docdir)/freedm/COPYING"
- -install -Dm 644 $(MANUAL_PDF_FILES) -t "$(target)$(docdir)/freedm"
install-freedoom: $(FREEDOOM1) $(FREEDOOM2) $(HTMLDOCS) \
- $(MANUAL_PDF_FILES) freedoom1.6 freedoom2.6 \
+ freedoom1.6 freedoom2.6 \
io.github.freedoom.Phase1.png \
io.github.freedoom.Phase2.png
install -Dm 644 dist/io.github.freedoom.Phase1.desktop \
@@ -290,7 +287,6 @@
install -Dm 644 CREDITS CREDITS-MUSIC NEWS.html README.html \
-t "$(target)$(docdir)/freedoom"
install -Dm 644 COPYING.adoc "$(target)$(docdir)/freedoom/COPYING"
- -install -Dm 644 $(MANUAL_PDF_FILES) -t "$(target)$(docdir)/freedoom"
# For the following uninstall targets the manual arguments are intentionally
# not quoted since they are wildcards.
@@ -307,8 +303,7 @@
"$(target)$(docdir)/freedm/CREDITS-MUSIC" \
"$(target)$(docdir)/freedm/COPYING" \
"$(target)$(docdir)/freedm/NEWS.html" \
- "$(target)$(docdir)/freedm/README.html" \
- $(target)$(docdir)/freedm/freedoom-manual-??.pdf
+ "$(target)$(docdir)/freedm/README.html"
-rmdir -p "$(target)/share/applications" \
"$(target)/share/metainfo" "$(target)/share/icons" \
"$(target)$(bindir)" "$(target)$(mandir)/man6" \
@@ -332,8 +327,7 @@
"$(target)$(docdir)/freedoom/CREDITS-MUSIC" \
"$(target)$(docdir)/freedoom/COPYING" \
"$(target)$(docdir)/freedoom/NEWS.html" \
- "$(target)$(docdir)/freedoom/README.html" \
- $(target)$(docdir)/freedoom/freedoom-manual-??.pdf
+ "$(target)$(docdir)/freedoom/README.html"
-rmdir -p "$(target)/share/applications" \
"$(target)/share/metainfo" "$(target)/share/icons" \
"$(target)$(bindir)" "$(target)$(mandir)/man6" \