From: Aaron M. Ucko <ucko@debian.org>
Date: Thu, 9 Jun 2011 00:20:18 +0000 (+0000)
Subject: debian/rules (override_dh_install): Correctly support building only
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~336
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2df5fe8dec5ae24f2c30a81c2c296e722ffbbe6d;p=ncbi-blast%2B.git

debian/rules (override_dh_install): Correctly support building only
architecture-dependent packages.  (Partially addresses #629656.)
---

diff --git a/debian/changelog b/debian/changelog
index 26e9d42b..786e33c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ ncbi-blast+ (2.2.25-2) UNRELEASED; urgency=low
 
   * Team upload.
   * NOT RELEASED YET
+  * Fix several sources of build failures (per #629656):
+    - debian/rules (override_dh_install): Correctly support building only
+      architecture-dependent packages.
 
- -- Aaron M. Ucko <ucko@debian.org>  Wed, 08 Jun 2011 20:10:46 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 08 Jun 2011 20:20:13 -0400
 
 ncbi-blast+ (2.2.25-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index c7183c25..4596e17b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ override_dh_auto_test:
 	-cat c++/BUILD/build/check.sh.out_err
 
 instroot = debian/ncbi-blast+/usr
+leg_bin = debian/ncbi-blast+-legacy/usr/share/ncbi-blast+/bin
 override_dh_auto_install:
 	cp c++/BUILD/lib/*.so $(instroot)/lib/ncbi-blast+/
 	cp c++/BUILD/bin/*    $(instroot)/bin/
@@ -48,8 +49,7 @@ override_dh_install:
 	    $(instroot)/bin/project_tree_builder \
 	    $(instroot)/lib/ncbi-blast+/libtest_*.so
 
-	cp debian/legacy/legacy.sh \
-	    debian/ncbi-blast+-legacy/usr/share/ncbi-blast+/bin/
+	if test -d $(leg_bin); then cp debian/legacy/legacy.sh $(leg_bin)/; fi
 
 override_dh_clean:
 	dh_clean