From d07b88e469abbb7c82d10fbe17473d529aaa4388 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 14 May 2011 21:07:55 +0000
Subject: Add freedesktop.org desktop files for chocolate-doom, chocolate-setup
 (thanks Adrián Chaves Fernández).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2337
---
 data/Makefile.am | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 data/Makefile.am

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..dccb51a3
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,21 @@
+
+EXTRA_DIST=              \
+        README           \
+        doom.ico         \
+        doom8.ico        \
+        doom.png         \
+        setup.ico        \
+        setup8.ico       \
+        setup.png        \
+        convert-icon
+
+iconsdir = $(prefix)/share/icons
+icons_DATA = @PROGRAM_PREFIX@doom.png   \
+             @PROGRAM_PREFIX@setup.png
+
+@PROGRAM_PREFIX@doom.png : doom.png
+	cp $^ $@
+
+@PROGRAM_PREFIX@setup.png : setup.png
+	cp $^ $@
+
-- 
cgit v1.2.3


From 736082f2c07aec39311b8356e474f447c06abcd3 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 21 Jul 2011 14:21:57 +0000
Subject: Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub
 Lach).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2354
---
 data/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index dccb51a3..05951cb0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,8 @@ icons_DATA = @PROGRAM_PREFIX@doom.png   \
              @PROGRAM_PREFIX@setup.png
 
 @PROGRAM_PREFIX@doom.png : doom.png
-	cp $^ $@
+	cp $< $@
 
 @PROGRAM_PREFIX@setup.png : setup.png
-	cp $^ $@
+	cp $< $@
 
-- 
cgit v1.2.3