[Reproducible-commits] [texlive-bin] 08/16: mv c-auto.h into /u/i/<triplet>

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository texlive-bin.

commit 44088ed7c0f467af2c71f8153a8d196be07487b8
Author: Norbert Preining <preining at debian.org>
Date:   Mon Sep 21 09:47:33 2015 +0900

    mv c-auto.h into /u/i/<triplet>
---
 debian/changelog |  3 ++-
 debian/rules     | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2574a7..695557d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ texlive-bin (2015.20150524.37493-7) UNRELEASED; urgency=medium
     - replace usr/lib with usr/lib/* throughout
     - mark texlive-binaries (and dummy luatex) M-A: foreign
     - mark all shlib packages M-A: same (but leave the -dev packages for now)
+    - move c-auto.h into /u/i/$triplet/kpathsea
 
- -- Norbert Preining <preining at debian.org>  Sun, 20 Sep 2015 11:26:49 +0900
+ -- Norbert Preining <preining at debian.org>  Mon, 21 Sep 2015 09:47:11 +0900
 
 texlive-bin (2015.20150524.37493-6) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index b19f80a..95819e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,9 @@ LUAJIT_GOOD_ARCHS := amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i3
 # enough versions of automake and friends
 #export AM_V_P=false
 
-DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 
 ifeq ($(DEB_HOST_ARCH), alpha)
   export LDFLAGS = -Wl,--no-relax
@@ -166,9 +168,10 @@ override_dh_install:
 	# remove .la files which we do not install, so that dh_install
 	# can work with --fail-missing
 	rm -f debian/tmp/usr/lib/*.la debian/tmp/usr/lib/*/*.la
-	# mv c-auto.h back into /usr/include/kpathsea
-	# we don't support this kind of arch-separation by now
-	mv debian/tmp/usr/lib/kpathsea/c-auto.h debian/tmp/usr/include/kpathsea/
+	# mv c-auto.h into arch-dependent include path
+	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/kpathsea
+	mv debian/tmp/usr/lib/kpathsea/c-auto.h \
+		debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/kpathsea/
 	rmdir debian/tmp/usr/lib/kpathsea
 	dh_install --fail-missing --sourcedir=$(CURDIR)/debian/tmp
 	# replace xdvi wrapper shell script with perl variant to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git