[Pkg-fglrx-devel] r679 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Sat Aug 6 22:28:57 UTC 2011
Author: anbe-guest
Date: 2011-08-06 22:28:56 +0000 (Sat, 06 Aug 2011)
New Revision: 679
Modified:
fglrx-driver/trunk/debian/rules
Log:
reorder rules, move everything related to get-orig-source to the end
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-08-06 22:05:21 UTC (rev 678)
+++ fglrx-driver/trunk/debian/rules 2011-08-06 22:28:56 UTC (rev 679)
@@ -6,13 +6,6 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER=ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
-URL_PATH=www2.ati.com/drivers/linux
-CACHEDIR=/tmp
-endif
-
ifeq ($(DEB_HOST_ARCH),amd64)
arch=x86_64
xpic=xpic_64a
@@ -28,15 +21,19 @@
%: %.in
sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+%:
+ dh $@
+
override_dh_auto_clean:
test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
rm -f $(generated)
override_dh_auto_configure: $(generated)
cd debian/man && ./autogen.sh --copy
- chmod +x debian/man/configure debian/man/install-sh debian/man/missing
cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man \
--with-xserver=Xorg
+
+override_dh_auto_build:
$(MAKE) -C debian/man
override_dh_install:
@@ -58,6 +55,15 @@
test ! -d debian/fglrx-glx-ia32 || \
sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/fglrx-glx-ia32/DEBIAN/shlibs
+############################################################################
+
+ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+INSTALLER=ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
+URL_PATH=www2.ati.com/drivers/linux
+CACHEDIR=/tmp
+endif
+
get-orig-source-checks:
# This target needs DEB_BUILD_OPTIONS to contain the version specification
# in the following form: VER=some.version.number
@@ -94,6 +100,3 @@
.PHONY: get-orig-source
get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
-
-%:
- dh ${@}
More information about the Pkg-fglrx-devel
mailing list