summaryrefslogtreecommitdiff
path: root/dh
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-14 17:25:24 -0400
committerJoey Hess <joey@kitenet.net>2011-06-14 17:25:24 -0400
commit0f2969a41c07f0435ddac202a858ab914fd7eff7 (patch)
tree291b7141ef78eb101ee72000d8d9aa329bd0fd21 /dh
parentc64ed6af2930e40666aa3069d4e40a7dcd1bc1dd (diff)
parente8c799129672d5b7dbac58a06fadd175cffaa7ed (diff)
Merge branch 'master' into smarter-targets
Conflicts: dh
Diffstat (limited to 'dh')
-rwxr-xr-xdh5
1 files changed, 4 insertions, 1 deletions
diff --git a/dh b/dh
index 8d8c920..aba8c27 100755
--- a/dh
+++ b/dh
@@ -278,6 +278,9 @@ options can override this behavior.
A sequence can also run dependent targets in debian/rules. For
example, the "binary" sequence runs the "install" target.
+B<dh> sets environment variables listed by B<dpkg-buildflags>, unless
+they are already set. It supports DEB_BUILD_OPTIONS=noopt too.
+
B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass information
through to debhelper commands that are run inside override targets. The
contents (and indeed, existence) of this environment variable, as the name
@@ -315,7 +318,7 @@ init(options => {
bundling => 0,
);
inhibit_log();
-
+set_buildflags();
# If make is using a jobserver, but it is not available
# to this process, clean out MAKEFLAGS. This avoids