summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-02-15 13:44:04 +0000
committerSimon McVittie <smcv@debian.org>2014-02-15 13:44:04 +0000
commit18c8785402f81ab91bf2da7476ef487d4330cf4a (patch)
treee0cfb9a2194eecde7c007720150e582099b15975
parent444f3e60bb832f0335393070ad0c5681a4137425 (diff)
downloaddbus-18c8785402f81ab91bf2da7476ef487d4330cf4a.tar.gz
debian/rules: look for DEB_BUILD_PROFILES, the new name for DEB_BUILD_PROFILE
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules6
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 88d53d47..51006866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dbus (1.8.0-2) UNRELEASED; urgency=medium
+
+ * debian/rules: look for DEB_BUILD_PROFILES, the new name for
+ DEB_BUILD_PROFILE
+
+ -- Simon McVittie <smcv@debian.org> Sat, 15 Feb 2014 13:43:08 +0000
+
dbus (1.8.0-1) unstable; urgency=low
* New upstream stable release
diff --git a/debian/rules b/debian/rules
index 3d6c28a6..66f6384c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ common_configure_flags := \
--libexecdir=\$${prefix}/lib/dbus-1.0 \
$(NULL)
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILE)),)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
ifeq ($(DEB_HOST_ARCH_OS),linux)
# Non-bootstrap build on Linux: add Linux-specifics
common_configure_flags += \
@@ -66,7 +66,7 @@ udeb_configure_flags := \
CFLAGS='$(CFLAGS) -Os' \
$(NULL)
-ifeq ($(filter nodocs,$(DEB_BUILD_OPTIONS))$(filter stage1,$(DEB_BUILD_PROFILE)),)
+ifeq ($(filter nodocs,$(DEB_BUILD_OPTIONS))$(filter stage1,$(DEB_BUILD_PROFILES)),)
# documentation enabled
normal_configure_flags += \
--enable-xml-docs \
@@ -82,7 +82,7 @@ normal_configure_flags += \
$(NULL)
endif
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILE)),)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
# not a stage1 build - build all the tests
debug_configure_flags += \
--enable-tests \