[Pkg-voip-commits] [pjproject] 09/13: Move arch0dependent headers to a triplet subdir

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master
in repository pjproject.

commit e0ec49713717d7e38af2970f717a44319be7a0b7
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sat Aug 1 14:26:27 2015 +0300

    Move arch0dependent headers to a triplet subdir
    
    Two of the pj header files are architecture-dependent. Move them under
    /usr/include/<triplet>.
---
 debian/libpjproject-dev.install |  1 +
 debian/rules                    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/libpjproject-dev.install b/debian/libpjproject-dev.install
index c3d7016..d6ce5ca 100644
--- a/debian/libpjproject-dev.install
+++ b/debian/libpjproject-dev.install
@@ -1,4 +1,5 @@
 usr/include/pj*
+usr/include/*/pj/compat/*.h
 usr/lib/*/libpj*.so
 usr/lib/*/libpj*.a
 usr/lib/*/pkgconfig/libpjproject.pc
diff --git a/debian/rules b/debian/rules
index 43b17fe..3049a91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,11 @@ run-tests:
 
 PC_FILE=$(CURDIR)/debian/tmp/usr/lib/*/pkgconfig/libpjproject.pc
 pythn_mod=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages/_pjsua.so
+headers_names=m_auto.h os_auto.h
+headers_sub_dir=pj/compat
+headers_base=$(CURDIR)/debian/tmp/usr/include
+headers_dir=$(headers_base)/$(headers_sub_dir)
+headers=$(headers_names:%=$(headers_dir)/%)
 override_dh_auto_install:
 	dh_auto_install
 	# Disable it for now. This will wait (and be done properly) in
@@ -67,5 +72,10 @@ override_dh_auto_install:
 	sed -i \
 		-e "s|$$CFLAGS||" -e "s|$$CPPFLAGS||" -e 's|-fPIC||' \
 	       	$(PC_FILE)
+	# Some headers are architecture-dependent. For now, move them manually:
+	ma=`dpkg-architecture -qDEB_BUILD_MULTIARCH`; \
+	  new_dir=$(headers_base)/$$ma/$(headers_sub_dir); \
+	  mkdir -p $$new_dir; \
+	  mv $(headers) $$new_dir/
 
 .PHONY: build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git