[dolphin-emu] 07/08: Add -DDISTRIBUTOR define
James Cowgill
jcowgill at moszumanska.debian.org
Fri Jun 24 11:01:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill pushed a commit to branch master
in repository dolphin-emu.
commit 53568f24aebfcc8372788461e62123780712e068
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Fri Jun 24 11:26:57 2016 +0100
Add -DDISTRIBUTOR define
Bump dpkg-dev dependency version for dpkg-vendor.
---
debian/control | 2 +-
debian/rules | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 50dc960..078dad1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
Build-Depends:
debhelper (>= 9),
cmake,
- dpkg-dev (>= 1.17.0),
+ dpkg-dev (>= 1.17.17),
gettext,
libao-dev,
libasound2-dev,
diff --git a/debian/rules b/debian/rules
index d488ebd..b035550 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,20 @@
export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# distributor is used by the opt-in analytics
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu; echo $$?),0)
+ DISTRIBUTOR := ubuntu.com
+else
+ DISTRIBUTOR := debian.org
+endif
+
%:
dh $@ --parallel -Bbuild
CMAKE_OPTIONS := \
-Dbindir=/usr/games \
-Ddatadir=/usr/share/games/dolphin-emu \
+ -DDISTRIBUTOR=$(DISTRIBUTOR) \
-DUSE_SHARED_ENET=ON \
-DGTEST_DIR=/usr/src/gtest
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git
More information about the Pkg-games-commits
mailing list