r13319 - software/thumbnails/debian

[Paul Wise]

Author: pabs
Date: 2012-02-27 05:18:16 +0000 (Mon, 27 Feb 2012)
New Revision: 13319

Modified:
   software/thumbnails/debian/rules
Log:
Debhelper-related fixups

Modified: software/thumbnails/debian/rules
===================================================================
--- software/thumbnails/debian/rules	2012-02-27 05:05:50 UTC (rev 13318)
+++ software/thumbnails/debian/rules	2012-02-27 05:18:16 UTC (rev 13319)
@@ -5,14 +5,13 @@
 %:
 	dh $@ --parallel
 
-INPUTPNG := $(wildcard *png)
-INPUTJPG := $(wildcard *jpg)
+INPUTPNG := $(wildcard games-thumbnails/thumbs/*.png)
+INPUTJPG := $(wildcard games-thumbnails/thumbs/*.jpg)
 
-THUMBDEST := debian/games-thumbnails/usr/share/games/thumbnails
-OUTPUTPNG := $(addprefix $(THUMBDEST)/, $(INPUTPNG))
-OUTPUTJPG := $(addprefix $(THUMBDEST)/, $(INPUTJPG))
+OUTPUTPNG := $(notdir $(INPUTPNG))
+OUTPUTJPG := $(notdir $(INPUTJPG))
 
-$(OUTPUTPNG): $(THUMBDEST)/%.png: %.png install
+$(OUTPUTPNG): %.png: games-thumbnails/thumbs/%.png
 	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 # http://lists.debian.org/debian-devel-games/2008/03/msg00123.html
@@ -20,14 +19,13 @@
 	advpng -q -z4 $@
 endif
 
-$(OUTPUTJPG): $(THUMBDEST)/%.jpg: %.jpg install
+$(OUTPUTJPG): %.jpg: games-thumbnails/thumbs/%.jpg
 	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	jpegoptim -q $@
 endif
 
 override_dh_auto_build: $(OUTPUTJPG) $(OUTPUTPNG)
-	cp games-thumbnails/thumbs/*.png .
 
 get-orig-source:
 	./fetch-thumbnails