[Pkg-ceph-commits] [ceph] 02/04: rules cleanup

Dmitry Smirnov onlyjob at moszumanska.debian.org
Sat Apr 19 06:58:32 UTC 2014


This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit dc3847c
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Apr 19 04:53:04 2014

    rules cleanup
    
     * dont include "buildflags.mk".
     * don't export "DESTDIR"; pass "--destdir" to dh_auto_install.
---
 debian/rules | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 28e1959..b3b0ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,11 @@
 # -*- makefile -*-
 #export DH_VERBOSE=1
 
-export DESTDIR=$(CURDIR)/debian/tmp
-
 # minimise needless linking
 export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
 
 # Enable hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-include /usr/share/dpkg/buildflags.mk
 
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -59,7 +56,7 @@ override_dh_auto_clean:
 	rm -fv debian/*.upstart
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
 
 override_dh_installinit:
 	dh_installinit --no-start

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git



More information about the Pkg-ceph-commits mailing list