Author: alfie
Date: 2008-01-17 19:40:28 +0000 (Thu, 17 Jan 2008)
New Revision: 5435
Modified:
packages/trunk/wesnoth/debian/rules
Log:
Move the linking workaround from install-{indep,arch} to binary-{indep,arch}
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2008-01-17 18:19:46 UTC (rev 5434)
+++ packages/trunk/wesnoth/debian/rules 2008-01-17 19:40:28 UTC (rev 5435)
@@ -87,15 +87,6 @@
$(MAKE) -C po install \
localedir=/usr/share/locale
- # workaround for dh_link (mis)behavior, see BTS#445550
- for i in ttf-dejavu/DejaVuSans.ttf sazanami/sazanami-gothic.ttf; do \
- ln -s /usr/share/fonts/truetype/$i
- debian/wesnoth-data/usr/share/games/wesnoth/fonts/$(shell
basename $i); \
- done
- ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
- debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
-
-
dh_install -i
@@ -111,14 +102,6 @@
$(MAKE) install-exec
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) -C doc/man install
-
- # workaround for dh_link (mis)behavior, see BTS#445550
- ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
- debian/wesnoth-data/usr/share/icons/wesnoth_editor-icon.png
-
- for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6.gz; do \
- ln -s wesnoth.6.gz $(shell dirname $i)/wesnoth-nolog.6.gz; \
- done
dh_install -s
# Must not depend on anything. This is to be called by
@@ -150,10 +133,26 @@
binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+ # workaround for dh_link (mis)behavior, see BTS#445550
+ for i in ttf-dejavu/DejaVuSans.ttf sazanami/sazanami-gothic.ttf; do \
+ ln -s /usr/share/fonts/truetype/$i
+ debian/wesnoth-data/usr/share/games/wesnoth/fonts/$(shell
basename $i); \
+ done
+ ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
+ debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
+
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+ # workaround for dh_link (mis)behavior, see BTS#445550
+ ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
+ debian/wesnoth-data/usr/share/icons/wesnoth_editor-icon.png
+ for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6.gz; do \
+ ln -s wesnoth.6.gz $(shell dirname $i)/wesnoth-nolog.6.gz; \
+ done
+
+
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
