chiark
/
gitweb
/
~ian
/
chiark-tcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Multiarch: Use correct M-A triplet (DEB_HOST_MULTIARCH) for libsubdir. Closes:#856526.
[chiark-tcl.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index f5d4a2af04e6afb48f73af376bb78eb5ff02a622..3675728eee9fcb4459de8b2e73df4b19a7bd9e8d 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-26,6
+26,9
@@
docdir=usr/share/doc/$(docpackage)
tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
+march := $(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
+libsubdir = /$(march)
+
garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
ifneq ($(garch),)
garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
ifneq ($(garch),)
@@
-57,7
+60,7
@@
binary-indep:
binary-arch: checkroot build
$(checkdir)
-rm -rf debian/$(docpackage) debian/$(libpackage)
binary-arch: checkroot build
$(checkdir)
-rm -rf debian/$(docpackage) debian/$(libpackage)
- install -d debian/$(libpackage)/usr/lib
+ install -d debian/$(libpackage)/usr/lib
$(libsubdir)
install -d debian/$(docpackage)/usr/share/doc/$(docpackage)
set -e; for f in lintian; do \
install -d debian/$(docpackage)/usr/share/doc/$(docpackage)
set -e; for f in lintian; do \
@@
-66,7
+69,7
@@
binary-arch: checkroot build
debian/$(libpackage)/usr/share/$$f/overrides/$(libpackage); \
done
debian/$(libpackage)/usr/share/$$f/overrides/$(libpackage); \
done
- cp */*.so debian/$(libpackage)/usr/lib/.
+ cp */*.so debian/$(libpackage)/usr/lib
$(libsubdir)
/.
set -e; for f in */*.[ch]; do \
perl debian/extractdoc <$$f \
set -e; for f in */*.[ch]; do \
perl debian/extractdoc <$$f \