diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-06-03 15:09:22 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-03 15:13:01 +0200 |
| commit | c0bbb19c0218abb525871b99657022ed5413161f (patch) | |
| tree | ba4a74ca7cde0d9af2c00a52a7a9ea9e85d48552 /ubuntu/_base/applications/tdedocker | |
| parent | 3d94bcdbd8164f916844319f8f0c9120ade6c446 (diff) | |
| download | tde-packaging-c0bbb19c0218abb525871b99657022ed5413161f.tar.gz tde-packaging-c0bbb19c0218abb525871b99657022ed5413161f.zip | |
DEB: Resolve FTBFS in support for using the $(DEB_HOST_MULTIARCH) variable
if the package does not contain any install and links files.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/_base/applications/tdedocker')
| -rw-r--r-- | ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk index 7c67fc9ca..4eeb672b0 100644 --- a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk @@ -141,8 +141,11 @@ common-binary-arch:: done; \ rm -f $$tmpf ) # update multi-arch path in install files - for a in debian/*install debian/*links; do \ + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ done @@ -152,7 +155,9 @@ clean:: rm -f debian/stamp-man-pages rm -rf debian/shlibs-check # revert multi-arch path in install files - for a in debian/*install debian/*links; do \ + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ [ ! -f $$a.arch ] || \ mv $$a.arch $$a; \ done |