shithub: choc

Download patch

ref: 14b478969763b156c50498570f768f50e7bb755c
parent: 25252bf9646f2adabac508039a4b1c7e0f0d0058
author: Simon Howard <[email protected]>
date: Thu Nov 3 18:18:36 EDT 2011

Remove use of $< in Makefiles, for compatibility with OpenBSD's make.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2473

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,8 @@
              @[email protected]
 
 @[email protected] : doom.png
-	cp $< $@
+	cp doom.png $@
 
 @[email protected] : setup.png
-	cp $< $@
+	cp setup.png $@
 
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -40,7 +40,7 @@
 app_DATA = @[email protected]
 
 @[email protected] : setup.desktop
-	cp $^ $@
+	cp setup.desktop $@
 
 .rc.o:
 	$(WINDRES) $^ -o $@
@@ -50,7 +50,7 @@
 if HAVE_PYTHON
 
 setup_icon.c : ../data/setup8.ico
-	../data/convert-icon $^ $@
+	../data/convert-icon ../data/setup8.ico $@
 
 endif
 
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,13 +187,13 @@
 app_DATA = @[email protected]
 
 @[email protected] : doom.desktop
-	cp $< $@
+	cp doom.desktop $@
 
 screensaverdir = $(prefix)/share/applications/screensavers
 screensaver_DATA = @[email protected]
 
 @[email protected]: doom-screensaver.desktop
-	cp $< $@
+	cp doom-screensaver.desktop $@
 
 .rc.o:
 	$(WINDRES) $< -o $@