From f277033fbba813411862be30164436394e67ef1a Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Mon, 29 Sep 2014 18:37:59 -0700
Subject: [PATCH] Makefile: Clean up install targets, don't duplicate them all.

---
 Makefile               | 39 ++++++++++-----------------------------
 dist/freedm.desktop    |  2 +-
 dist/freedoom1.desktop |  2 +-
 dist/freedoom2.desktop |  2 +-
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 9af105d7..c4800463 100644
--- a/Makefile
+++ b/Makefile
@@ -138,40 +138,21 @@ target=$(DESTDIR)$(prefix)
 	sed -e s/freedoom/$*/ dist/freedoom.adoc > dist/$*.adoc
 	a2x -f manpage dist/$*.adoc
 
-install-freedm: $(FREEDM) freedm.6
-	install -d "$(target)$(bindir)"
-	install -m 755 dist/freedoom "$(target)$(bindir)/freedm"
-	install -d "$(target)$(mandir)/man6"
-	install -m 644 dist/freedm.6 "$(target)$(mandir)/man6"
-	install -d "$(target)$(waddir)"
-	install -m 644 $(FREEDM) "$(target)$(waddir)"
-	install -d "$(target)/share/applications"
-	install -m 644 dist/freedm.desktop "$(target)/share/applications"
-	install -d "$(target)/share/appdata"
-	install -m 644 dist/freedm.appdata.xml "$(target)/share/appdata"
+# This is bad because it assumes the IWADs will always be defined like
+# this.  I just can't see another way to do it.  Fix later if possible.
 
-install-freedoom1: $(FREEDOOM1) freedoom1.6
+install-%: $(WADS)/%.wad %.6
 	install -d "$(target)$(bindir)"
-	install -m 755 dist/freedoom "$(target)$(bindir)/freedoom1"
+	install -m 755 dist/freedoom "$(target)$(bindir)/$*"
 	install -d "$(target)$(mandir)/man6"
-	install -m 644 dist/freedoom1.6 "$(target)$(mandir)/man6"
+	install -m 644 dist/$*.6 "$(target)$(mandir)/man6"
 	install -d "$(target)$(waddir)"
-	install -m 644 $(FREEDOOM1) "$(target)$(waddir)"
+	install -m 644 $(WADS)/$*.wad "$(target)$(waddir)"
 	install -d "$(target)/share/applications"
-	install -m 644 dist/freedoom1.desktop "$(target)/share/applications"
+	install -m 644 dist/$*.desktop "$(target)/share/applications"
 	install -d "$(target)/share/appdata"
-	install -m 644 dist/freedoom1.appdata.xml "$(target)/share/appdata"
-
-install-freedoom2: $(FREEDOOM2) freedoom2.6
-	install -d "$(target)$(bindir)"
-	install -m 755 dist/freedoom "$(target)$(bindir)/freedoom2"
-	install -d "$(target)$(mandir)/man6"
-	install -m 644 dist/freedoom2.6 "$(target)$(mandir)/man6"
-	install -d "$(target)$(waddir)"
-	install -m 644 $(FREEDOOM2) "$(target)$(waddir)"
-	install -d "$(target)/share/applications"
-	install -m 644 dist/freedoom2.desktop "$(target)/share/applications"
-	install -d "$(target)/share/appdata"
-	install -m 644 dist/freedoom2.appdata.xml "$(target)/share/appdata"
+	install -m 644 dist/$*.appdata.xml "$(target)/share/appdata"
+	install -d "$(target)/share/icons"
+	install -m 644 dist/freedoom.png "$(target)/share/icons/$*.png"
 
 install: install-freedm install-freedoom1 install-freedoom2
diff --git a/dist/freedm.desktop b/dist/freedm.desktop
index adf579bc..7aa70c24 100644
--- a/dist/freedm.desktop
+++ b/dist/freedm.desktop
@@ -3,7 +3,7 @@ Name=FreeDM
 Comment=Fight friends and enemies in competitive deathmatch
 GenericName=First Person Shooter Game
 Type=Application
-Icon=freedoom
+Icon=freedm
 Keywords=first;person;shooter;doom;freedoom;
 Categories=Game;ActionGame;
 Path=/usr/share/games/doom
diff --git a/dist/freedoom1.desktop b/dist/freedoom1.desktop
index f4696455..3f19de68 100644
--- a/dist/freedoom1.desktop
+++ b/dist/freedoom1.desktop
@@ -3,7 +3,7 @@ Name=Freedoom: Phase 1
 Comment=Battle monsters in four 9-level chapters
 GenericName=First Person Shooter Game
 Type=Application
-Icon=freedoom
+Icon=freedoom1
 Keywords=first;person;shooter;doom;
 Categories=Game;ActionGame;
 Path=/usr/share/games/doom
diff --git a/dist/freedoom2.desktop b/dist/freedoom2.desktop
index e9714f2b..a249119d 100644
--- a/dist/freedoom2.desktop
+++ b/dist/freedoom2.desktop
@@ -3,7 +3,7 @@ Name=Freedoom: Phase 2
 Comment=Battle monsters in one massive 32-level chapter
 GenericName=First Person Shooter Game
 Type=Application
-Icon=freedoom
+Icon=freedoom2
 Keywords=first;person;shooter;doom;
 Categories=Game;ActionGame;
 Path=/usr/share/games/doom