summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-11-04 21:01:59 +0400
committerIgor Pashev <pashev.igor@gmail.com>2012-11-04 21:01:59 +0400
commitc9d2e223016929d4a59bd4a942c7748c0535d275 (patch)
treec975224e8bafc3e4f7223b937cdfae1e6cc029dc
parent6beb6e8db453c0717aaf64311680a6e57a711421 (diff)
downloaddh-illumos-c9d2e223016929d4a59bd4a942c7748c0535d275.tar.gz
Extract usr/src/cmd/Makefile* if building under usr/src/cmd
-rw-r--r--debian/changelog8
-rwxr-xr-xdh_illumos_gate7
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 100dfd2..357ea7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dh-illumos (9.5) UNRELEASED; urgency=low
+
+ * Extract usr/src/cmd/Makefile* if any path
+ under usr/src/cmd is being extracted
+ and -B option is given.
+
+ -- Igor Pashev <pashev.igor@gmail.com> Sun, 04 Nov 2012 20:04:05 +0400
+
dh-illumos (9.4) unstable; urgency=low
* Append $($(MACH)_AS_XARCH) to $(COMPILE.s)
diff --git a/dh_illumos_gate b/dh_illumos_gate
index f92bce8..b59d2c0 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -44,7 +44,9 @@ L<dh_illumos_make(1)> provides more convenient way to do this.
Extract files known to be required for building illumos components.
These are F<usr/src/tools/scripts/bldenv.sh>, F<usr/src/Makefile*>,
-F<usr/src/common/mapfiles/*>. This option is provided only for convenience.
+F<usr/src/common/mapfiles/*>. If any file under F<usr/src/lib> is
+requested, F<usr/src/lib/Makefile*> are extracted too. Same for
+F<usr/src/cmd>. This option is provided only for convenience.
You are free to extract these files explicitly.
=item B<-X>I<PATTERN> B<--exclude=>I<PATTERN>
@@ -144,6 +146,9 @@ if (@ARGV) {
if (grep {m|.*usr/src/lib/.*|} @ARGV) {
push @to_extract, 'usr/src/lib/Makefile*'
}
+ if (grep {m|.*usr/src/cmd/.*|} @ARGV) {
+ push @to_extract, 'usr/src/cmd/Makefile*'
+ }
}
push @to_extract, map {m,(?:illumos-gate/)?(.*),; $1} @ARGV;
} else {