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: Move .so's to triplet paths, and declare M-A: same.
[chiark-tcl.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index f5d4a2af04e6afb48f73af376bb78eb5ff02a622..f9ed503fb1637fdfe7b2cf0b3016607821366f5c 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-29,6
+29,8
@@
tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
ifneq ($(garch),)
garch := $(shell dpkg-architecture -q DEB_HOST_GNU_TYPE)
ifneq ($(garch),)
+libsubdir = /$(garch)
+
ifeq ($(origin CC),default)
export CC=$(garch)-gcc
endif
ifeq ($(origin CC),default)
export CC=$(garch)-gcc
endif
@@
-57,7
+59,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
+68,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 \