[Pkg-fglrx-devel] r607 - fglrx-driver/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-06-22 19:20:25 +0000 (Wed, 22 Jun 2011)
New Revision: 607

Modified:
   fglrx-driver/trunk/debian/rules
Log:
Simplify more.


Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-06-22 19:14:24 UTC (rev 606)
+++ fglrx-driver/trunk/debian/rules	2011-06-22 19:20:25 UTC (rev 607)
@@ -83,23 +83,23 @@
 	dh_prep
 	dh_installdirs
 	dh_install
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/fgl*" "usr/bin"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/ati*" "usr/bin"
-	dh_install --ignore=debian/$(PKG_daemon).install -p$(PKG_daemon)  "$(ARCH)/usr/sbin/ati*" "usr/sbin"
-	dh_install --ignore=debian/$(PKG_glx).install    -p$(PKG_glx)     "$(ARCH)/usr/X11R6/$(LIB)/fglrx/fglrx-libGL*" "usr/lib/fglrx"
-	mv debian/$(PKG_glx)/usr/lib/fglrx/fglrx-libGL.so.1.2 debian/$(PKG_glx)/usr/lib/fglrx/libGL.so.1.2
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/$(LIB)/*" "usr/lib"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libati*" "usr/lib"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)	"$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "usr/lib"
-	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/fgl*" "usr/bin"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/ati*" "usr/bin"
+	dh_install --ignore=debian/$(PKG_daemon).install  -p$(PKG_daemon)  "$(ARCH)/usr/sbin/ati*" "usr/sbin"
+	dh_install --ignore=debian/$(PKG_glx).install     -p$(PKG_glx)     "$(ARCH)/usr/X11R6/$(LIB)/fglrx/fglrx-libGL*" "usr/lib/fglrx"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/$(LIB)/*" "usr/lib"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libati*" "usr/lib"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "usr/lib"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules"
+	dh_install --ignore=debian/$(PKG_dkms).install    -p$(PKG_dkms)    "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)"
+	dh_install --ignore=debian/$(PKG_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
 	mkdir -p debian/$(PKG_driver)/usr/lib/fglrx
-	mv debian/$(PKG_driver)/usr/lib/xorg/modules/drivers/fglrx_drv.so debian/$(PKG_driver)/usr/lib/fglrx/
+	mv debian/$(PKG_glx)/usr/lib/fglrx/fglrx-libGL.so.1.2                   debian/$(PKG_glx)/usr/lib/fglrx/libGL.so.1.2
+	mv debian/$(PKG_driver)/usr/lib/xorg/modules/drivers/fglrx_drv.so       debian/$(PKG_driver)/usr/lib/fglrx/
 	mv debian/$(PKG_driver)/usr/lib/xorg/modules/extensions/fglrx-libglx.so debian/$(PKG_driver)/usr/lib/fglrx/libglx.so
 	rm -rf debian/$(PKG_driver)/usr/lib/xorg/modules/extensions/fglrx*
-	dh_install --ignore=debian/$(PKG_dkms).install -p$(PKG_dkms)	"$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)"
-	dh_install --ignore=debian/$(PKG_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
 	# Generate dkms.conf.
 	cat debian/dkms/dkms.conf.template|sed "s/_VERSION_/$(UPSTREAM_VERSION)/g" \
 		> debian/$(PKG_dkms)/$(DKMSBASE)/dkms.conf