From 08b1deeee3ba792c538d968a10d3a7d4921e9472 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Tue, 5 Nov 2019 11:27:12 -0800
Subject: [PATCH] Makefile: use XDG-compliant icon file names

Completes PR #638
---
 Makefile      | 24 ++++++++++++++----------
 dist/Makefile |  9 +++++----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 8e6fc3df..a1bae023 100644
--- a/Makefile
+++ b/Makefile
@@ -161,22 +161,24 @@ waddir?=/share/games/doom
 target=$(DESTDIR)$(prefix)
 
 install-freedm: $(FREEDM) $(HTMLDOCS) manual/freedoom-manual.pdf \
-                freedm.6 freedm.png
+                freedm.6 io.github.freedoom.FreeDM.png
 	install -Dm 644 dist/io.github.freedoom.FreeDM.desktop \
-	        -t "$(target)/share/applications"
+	                -t "$(target)/share/applications"
 	install -Dm 644 dist/io.github.freedoom.FreeDM.metainfo.xml \
-	        -t "$(target)/share/metainfo"
+	                -t "$(target)/share/metainfo"
 	install -Dm 755 dist/freedoom "$(target)$(bindir)/freedm"
 	install -Dm 644 dist/freedm.6 -t "$(target)$(mandir)/man6"
 	install -Dm 644 $(FREEDM) -t "$(target)$(waddir)"
-	install -Dm 644 dist/freedm.png -t "$(target)/share/icons"
+	install -Dm 644 dist/io.github.freedoom.FreeDM.png \
+	                -t "$(target)/share/icons"
 	install -Dm 644 CREDITS NEWS.html README.html -t "$(target)$(docdir)/freedm"
 	install -Dm 644 COPYING.adoc "$(target)$(docdir)/freedm/COPYING"
 	-install -Dm 644 manual/freedoom-manual.pdf -t "$(target)$(docdir)/freedm"
 
 install-freedoom: $(FREEDOOM1) $(FREEDOOM2) $(HTMLDOCS)                 \
                   manual/freedoom-manual.pdf freedoom1.6 freedoom2.6    \
-                  freedoom1.png freedoom2.png
+                  io.github.freedoom.Phase1.png                         \
+                  io.github.freedoom.Phase2.png
 	install -Dm 644 dist/io.github.freedoom.Phase1.desktop \
 	                -t "$(target)/share/applications"
 	install -Dm 644 dist/io.github.freedoom.Phase2.desktop \
@@ -190,8 +192,10 @@ install-freedoom: $(FREEDOOM1) $(FREEDOOM2) $(HTMLDOCS)                 \
 	install -Dm 644 dist/freedoom1.6 -t "$(target)$(mandir)/man6"
 	install -Dm 644 dist/freedoom2.6 -t "$(target)$(mandir)/man6"
 	install -Dm 644 $(FREEDOOM1) $(FREEDOOM2) -t "$(target)$(waddir)"
-	install -Dm 644 dist/freedoom1.png -t "$(target)/share/icons"
-	install -Dm 644 dist/freedoom2.png -t "$(target)/share/icons"
+	install -Dm 644 dist/io.github.freedoom.Phase1.png \
+	                -t "$(target)/share/icons"
+	install -Dm 644 dist/io.github.freedoom.Phase2.png \
+	                -t "$(target)/share/icons"
 	install -Dm 644 CREDITS NEWS.html README.html \
 	                -t "$(target)$(docdir)/freedoom"
 	install -Dm 644 COPYING.adoc "$(target)$(docdir)/freedoom/COPYING"
@@ -201,7 +205,7 @@ uninstall-freedm:
 	$(RM)                                                                   \
 	      "$(target)/share/applications/io.github.freedoom.FreeDM.desktop"  \
 	      "$(target)/share/metainfo/io.github.freedoom.FreeDM.metainfo.xml" \
-	      "$(target)/share/icons/freedm.png"                                \
+	      "$(target)/share/icons/io.github.freedoom.FreeDM.png"             \
 	      "$(target)$(bindir)/freedm"                                       \
 	      "$(target)$(mandir)/man6/freedm.6"                                \
 	      "$(target)$(waddir)/freedm.wad"                                   \
@@ -221,8 +225,8 @@ uninstall-freedoom:
 	      "$(target)/share/applications/io.github.freedoom.Phase2.desktop"  \
 	      "$(target)/share/metainfo/io.github.freedoom.Phase1.metainfo.xml" \
 	      "$(target)/share/metainfo/io.github.freedoom.Phase2.metainfo.xml" \
-	      "$(target)/share/icons/freedoom1.png"                             \
-	      "$(target)/share/icons/freedoom2.png"                             \
+	      "$(target)/share/icons/io.github.freedoom.Phase1.png"             \
+	      "$(target)/share/icons/io.github.freedoom.Phase2.png"             \
 	      "$(target)$(bindir)/freedoom1"                                    \
 	      "$(target)$(bindir)/freedoom2"                                    \
 	      "$(target)$(mandir)/man6/freedoom1.6"                             \
diff --git a/dist/Makefile b/dist/Makefile
index a0ead157..cb8a5949 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -1,19 +1,20 @@
 ASCIIDOC_MAN=a2x -f manpage
 .SUFFIXES: .adoc .6
 
-all: freedm.6 freedoom1.6 freedoom2.6 freedm.png freedoom1.png freedoom2.png
+all: freedm.6 freedoom1.6 freedoom2.6 io.github.freedoom.FreeDM.png \
+     io.github.freedoom.Phase1.png io.github.freedoom.Phase2.png
 
 %.6: freedoom.adoc
 	sed -e s/freedoom/$*/ $< > $*.adoc
 	$(ASCIIDOC_MAN) $*.adoc
 
-freedm.png: ../graphics/titlepic/freedm_title2.png
+io.github.freedoom.FreeDM.png: ../graphics/titlepic/freedm_title2.png
 	./pillow-resize $< $@ 64 64
 
-freedoom1.png: ../sprites/playa2a8.png
+io.github.freedoom.Phase1.png: ../sprites/playa2a8.png
 	./pillow-compose $< $@ 64 64
 
-freedoom2.png: ../sprites/heada1.png
+io.github.freedoom.Phase2.png: ../sprites/heada1.png
 	./pillow-compose $< $@ 64 64
 
 clean: