install shared library in multiarch location

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

58 files changed, 78 insertions, 75 deletions

diff --git a/ACE/debian/libace-6.5.8.install b/ACE/debian/libace-6.5.8.install
deleted file mode 100644
index 182a5eda411..00000000000
--- a/ACE/debian/libace-6.5.8.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/libACE-*.so
-usr/lib/libACE_ETCL-*.so
-usr/lib/libACE_Monitor_Control-*.so
-usr/lib/libACE_ETCL_Parser-*.so
-usr/lib/libACE_RLECompression-*.so
-usr/lib/libACE_Compression-*.so
diff --git a/ACE/debian/libace-6.5.8.install.in b/ACE/debian/libace-6.5.8.install.in
new file mode 100644
index 00000000000..b47b7240eaf
--- /dev/null
+++ b/ACE/debian/libace-6.5.8.install.in
@@ -0,0 +1,6 @@
+usr/lib/libACE-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_ETCL-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_Monitor_Control-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_ETCL_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_RLECompression-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_Compression-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install.in
index aede4930d69..389465719b1 100644
--- a/ACE/debian/libace-dev.install
+++ b/ACE/debian/libace-dev.install.in
@@ -11,15 +11,15 @@ usr/include/ace/*.inl
 usr/include/ace/*.cpp
 usr/include/ace/os_include
 usr/include/ace/Compression
-usr/lib/libACE.so
+usr/lib/libACE.so usr/lib/@DEB_HOST_MULTIARCH@/
 usr/include/ace/ETCL/*.h
 usr/include/ace/ETCL/*.inl
 usr/include/ace/Monitor_Control/*.h
-usr/lib/libACE_ETCL_Parser.so
-usr/lib/libACE_Monitor_Control.so
-usr/lib/libACE_ETCL.so
-usr/lib/libACE_Compression.so
-usr/lib/libACE_RLECompression.so
-usr/lib/pkgconfig/ACE.pc
-usr/lib/pkgconfig/ACE_ETCL.pc
-usr/lib/pkgconfig/ACE_ETCL_Parser.pc
+usr/lib/libACE_ETCL_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_Monitor_Control.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_ETCL.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_Compression.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACE_RLECompression.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
+usr/lib/pkgconfig/ACE_ETCL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
+usr/lib/pkgconfig/ACE_ETCL_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-flreactor-6.5.8.install b/ACE/debian/libace-flreactor-6.5.8.install
deleted file mode 100644
index 528836aacee..00000000000
--- a/ACE/debian/libace-flreactor-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_FlReactor-*.so
diff --git a/ACE/debian/libace-flreactor-6.5.8.install.in b/ACE/debian/libace-flreactor-6.5.8.install.in
new file mode 100644
index 00000000000..c49638be388
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_FlReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-flreactor-dev.install b/ACE/debian/libace-flreactor-dev.install
deleted file mode 100644
index 4de36ed5380..00000000000
--- a/ACE/debian/libace-flreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_FlReactor.so
-usr/include/ace/FlReactor
-usr/lib/pkgconfig/ACE_FlReactor.pc
diff --git a/ACE/debian/libace-flreactor-dev.install.in b/ACE/debian/libace-flreactor-dev.install.in
new file mode 100644
index 00000000000..29974e46bcd
--- /dev/null
+++ b/ACE/debian/libace-flreactor-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACE_FlReactor.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include/ace/FlReactor
+usr/lib/pkgconfig/ACE_FlReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-foxreactor-6.5.8.install b/ACE/debian/libace-foxreactor-6.5.8.install
deleted file mode 100644
index e360f29f5af..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_FoxReactor-*.so
diff --git a/ACE/debian/libace-foxreactor-6.5.8.install.in b/ACE/debian/libace-foxreactor-6.5.8.install.in
new file mode 100644
index 00000000000..b2f7852a85e
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_FoxReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-foxreactor-dev.install b/ACE/debian/libace-foxreactor-dev.install
deleted file mode 100644
index 610f74fa297..00000000000
--- a/ACE/debian/libace-foxreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_FoxReactor.so
-usr/include/ace/FoxReactor
-usr/lib/pkgconfig/ACE_FoxReactor.pc
diff --git a/ACE/debian/libace-foxreactor-dev.install.in b/ACE/debian/libace-foxreactor-dev.install.in
new file mode 100644
index 00000000000..2444a2ee96b
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACE_FoxReactor.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include/ace/FoxReactor
+usr/lib/pkgconfig/ACE_FoxReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-htbp-6.5.8.install b/ACE/debian/libace-htbp-6.5.8.install
deleted file mode 100644
index 08103fd5cad..00000000000
--- a/ACE/debian/libace-htbp-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_HTBP-*.so
diff --git a/ACE/debian/libace-htbp-6.5.8.install.in b/ACE/debian/libace-htbp-6.5.8.install.in
new file mode 100644
index 00000000000..c0661044fd6
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_HTBP-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-htbp-dev.install b/ACE/debian/libace-htbp-dev.install
deleted file mode 100644
index 4f12cdbf717..00000000000
--- a/ACE/debian/libace-htbp-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/ace/HTBP
-usr/lib/libACE_HTBP.so
-usr/lib/pkgconfig/ACE_HTBP.pc
diff --git a/ACE/debian/libace-htbp-dev.install.in b/ACE/debian/libace-htbp-dev.install.in
new file mode 100644
index 00000000000..27da316c2bf
--- /dev/null
+++ b/ACE/debian/libace-htbp-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/ace/HTBP
+usr/lib/libACE_HTBP.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE_HTBP.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-inet-6.5.8.install b/ACE/debian/libace-inet-6.5.8.install
deleted file mode 100644
index 59a73a509d0..00000000000
--- a/ACE/debian/libace-inet-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_INet-*.so
diff --git a/ACE/debian/libace-inet-6.5.8.install.in b/ACE/debian/libace-inet-6.5.8.install.in
new file mode 100644
index 00000000000..c8cddd876f2
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_INet-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-inet-dev.install b/ACE/debian/libace-inet-dev.install.in
index e68c7bb5479..6a98ecdaf70 100644
--- a/ACE/debian/libace-inet-dev.install
+++ b/ACE/debian/libace-inet-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/libACE_INet.so
+usr/lib/libACE_INet.so usr/lib/@DEB_HOST_MULTIARCH@/
 usr/include/ace/INet/Sock_IOStream.cpp
 usr/include/ace/INet/FTP_IOStream.h
 usr/include/ace/INet/HTTP_Request.inl
@@ -63,4 +63,4 @@ usr/include/ace/INet/FTP_Response.inl
 usr/include/ace/INet/FTP_URL.inl
 usr/include/ace/INet/HTTP_StreamPolicy.h
 usr/include/ace/INet/Request.h
-usr/lib/pkgconfig/ACE_INet.pc
+usr/lib/pkgconfig/ACE_INet.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install b/ACE/debian/libace-inet-ssl-6.5.8.install
deleted file mode 100644
index b9b8b9045f7..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_INet_SSL-*.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install.in b/ACE/debian/libace-inet-ssl-6.5.8.install.in
new file mode 100644
index 00000000000..7646d569860
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_INet_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-inet-ssl-dev.install b/ACE/debian/libace-inet-ssl-dev.install
deleted file mode 100644
index dfe71453638..00000000000
--- a/ACE/debian/libace-inet-ssl-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/ace/INet/*SSL*
-usr/include/ace/INet/*HTTPS*
-usr/lib/libACE_INet_SSL.so
-usr/lib/pkgconfig/ACE_INet_SSL.pc
diff --git a/ACE/debian/libace-inet-ssl-dev.install.in b/ACE/debian/libace-inet-ssl-dev.install.in
new file mode 100644
index 00000000000..c386ae97bdc
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-dev.install.in
@@ -0,0 +1,4 @@
+usr/include/ace/INet/*SSL*
+usr/include/ace/INet/*HTTPS*
+usr/lib/libACE_INet_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE_INet_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-rmcast-6.5.8.install b/ACE/debian/libace-rmcast-6.5.8.install
deleted file mode 100644
index 86e78259853..00000000000
--- a/ACE/debian/libace-rmcast-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_RMCast-*.so
diff --git a/ACE/debian/libace-rmcast-6.5.8.install.in b/ACE/debian/libace-rmcast-6.5.8.install.in
new file mode 100644
index 00000000000..d39b3033b18
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_RMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-rmcast-dev.install b/ACE/debian/libace-rmcast-dev.install
deleted file mode 100644
index 9fffea503bc..00000000000
--- a/ACE/debian/libace-rmcast-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/ace/RMCast
-usr/lib/libACE_RMCast.so
-usr/lib/pkgconfig/ACE_RMCast.pc
diff --git a/ACE/debian/libace-rmcast-dev.install.in b/ACE/debian/libace-rmcast-dev.install.in
new file mode 100644
index 00000000000..c1754ecb5f1
--- /dev/null
+++ b/ACE/debian/libace-rmcast-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/ace/RMCast
+usr/lib/libACE_RMCast.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE_RMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-ssl-6.5.8.install b/ACE/debian/libace-ssl-6.5.8.install
deleted file mode 100644
index 8df45a6d55f..00000000000
--- a/ACE/debian/libace-ssl-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_SSL-*.so
diff --git a/ACE/debian/libace-ssl-6.5.8.install.in b/ACE/debian/libace-ssl-6.5.8.install.in
new file mode 100644
index 00000000000..5f55d22a0ae
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-ssl-dev.install b/ACE/debian/libace-ssl-dev.install
deleted file mode 100644
index 1a1c38eb201..00000000000
--- a/ACE/debian/libace-ssl-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/ace/SSL
-usr/lib/libACE_SSL.so
-usr/lib/pkgconfig/ACE_SSL.pc
diff --git a/ACE/debian/libace-ssl-dev.install.in b/ACE/debian/libace-ssl-dev.install.in
new file mode 100644
index 00000000000..228d41c25f6
--- /dev/null
+++ b/ACE/debian/libace-ssl-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/ace/SSL
+usr/lib/libACE_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-tkreactor-6.5.8.install b/ACE/debian/libace-tkreactor-6.5.8.install
deleted file mode 100644
index 12ab35062d2..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_TkReactor-*.so
diff --git a/ACE/debian/libace-tkreactor-6.5.8.install.in b/ACE/debian/libace-tkreactor-6.5.8.install.in
new file mode 100644
index 00000000000..abd630df6c1
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_TkReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-tkreactor-dev.install b/ACE/debian/libace-tkreactor-dev.install
deleted file mode 100644
index d61e98a09f8..00000000000
--- a/ACE/debian/libace-tkreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_TkReactor.so
-usr/include/ace/TkReactor
-usr/lib/pkgconfig/ACE_TkReactor.pc
diff --git a/ACE/debian/libace-tkreactor-dev.install.in b/ACE/debian/libace-tkreactor-dev.install.in
new file mode 100644
index 00000000000..64451da14d0
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACE_TkReactor.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include/ace/TkReactor
+usr/lib/pkgconfig/ACE_TkReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-tmcast-6.5.8.install b/ACE/debian/libace-tmcast-6.5.8.install
deleted file mode 100644
index e066131dea0..00000000000
--- a/ACE/debian/libace-tmcast-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_TMCast-*.so
diff --git a/ACE/debian/libace-tmcast-6.5.8.install.in b/ACE/debian/libace-tmcast-6.5.8.install.in
new file mode 100644
index 00000000000..b6eda852bb3
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_TMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-tmcast-dev.install b/ACE/debian/libace-tmcast-dev.install
deleted file mode 100644
index 19eaad0d3cb..00000000000
--- a/ACE/debian/libace-tmcast-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/ace/TMCast
-usr/lib/libACE_TMCast.so
-usr/lib/pkgconfig/ACE_TMCast.pc
diff --git a/ACE/debian/libace-tmcast-dev.install.in b/ACE/debian/libace-tmcast-dev.install.in
new file mode 100644
index 00000000000..7c82eaff73c
--- /dev/null
+++ b/ACE/debian/libace-tmcast-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/ace/TMCast
+usr/lib/libACE_TMCast.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACE_TMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-xml-utils-6.5.8.install b/ACE/debian/libace-xml-utils-6.5.8.install
deleted file mode 100644
index 2428ec9f109..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_XML_Utils-*.so
diff --git a/ACE/debian/libace-xml-utils-6.5.8.install.in b/ACE/debian/libace-xml-utils-6.5.8.install.in
new file mode 100644
index 00000000000..082320b5e97
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_XML_Utils-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-xml-utils-dev.install b/ACE/debian/libace-xml-utils-dev.install
deleted file mode 100644
index b1539d17224..00000000000
--- a/ACE/debian/libace-xml-utils-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_XML_Utils.so
-usr/include/ace/XML_Utils/*
-usr/lib/pkgconfig/ACE_XML_Utils.pc
diff --git a/ACE/debian/libace-xml-utils-dev.install.in b/ACE/debian/libace-xml-utils-dev.install.in
new file mode 100644
index 00000000000..45cc54d4c02
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACE_XML_Utils.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include/ace/XML_Utils/*
+usr/lib/pkgconfig/ACE_XML_Utils.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libace-xtreactor-6.5.8.install b/ACE/debian/libace-xtreactor-6.5.8.install
deleted file mode 100644
index c53614c7208..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_XtReactor-*.so
diff --git a/ACE/debian/libace-xtreactor-6.5.8.install.in b/ACE/debian/libace-xtreactor-6.5.8.install.in
new file mode 100644
index 00000000000..75d4b27ef61
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libACE_XtReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libace-xtreactor-dev.install b/ACE/debian/libace-xtreactor-dev.install
deleted file mode 100644
index b24baea6a03..00000000000
--- a/ACE/debian/libace-xtreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_XtReactor.so
-usr/include/ace/XtReactor
-usr/lib/pkgconfig/ACE_XtReactor.pc
diff --git a/ACE/debian/libace-xtreactor-dev.install.in b/ACE/debian/libace-xtreactor-dev.install.in
new file mode 100644
index 00000000000..5b5b742bfaa
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-dev.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACE_XtReactor.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include/ace/XtReactor
+usr/lib/pkgconfig/ACE_XtReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libacexml-6.5.8.install b/ACE/debian/libacexml-6.5.8.install
deleted file mode 100644
index d3e912ffa51..00000000000
--- a/ACE/debian/libacexml-6.5.8.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so
-usr/lib/libACEXML-*.so
-usr/lib/libACEXML_Parser-*.so
diff --git a/ACE/debian/libacexml-6.5.8.install.in b/ACE/debian/libacexml-6.5.8.install.in
new file mode 100644
index 00000000000..b7d27d6a1f4
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.8.install.in
@@ -0,0 +1,3 @@
+usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACEXML-*.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACEXML_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libacexml-dev.install b/ACE/debian/libacexml-dev.install
deleted file mode 100644
index f7ed6a74851..00000000000
--- a/ACE/debian/libacexml-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/include/ACEXML
-usr/lib/libACEXML.so
-usr/lib/libACEXML_Parser.so
-usr/lib/libACEXML_XML_Svc_Conf_Parser.so
-usr/lib/pkgconfig/ACEXML.pc
-usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc
-usr/lib/pkgconfig/ACEXML_Parser.pc
diff --git a/ACE/debian/libacexml-dev.install.in b/ACE/debian/libacexml-dev.install.in
new file mode 100644
index 00000000000..4236fb6802b
--- /dev/null
+++ b/ACE/debian/libacexml-dev.install.in
@@ -0,0 +1,7 @@
+usr/include/ACEXML
+usr/lib/libACEXML.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACEXML_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/libACEXML_XML_Svc_Conf_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/ACEXML.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
+usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
+usr/lib/pkgconfig/ACEXML_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libkokyu-6.5.8.install b/ACE/debian/libkokyu-6.5.8.install
deleted file mode 100644
index 62854308f96..00000000000
--- a/ACE/debian/libkokyu-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libKokyu-*.so
diff --git a/ACE/debian/libkokyu-6.5.8.install.in b/ACE/debian/libkokyu-6.5.8.install.in
new file mode 100644
index 00000000000..f13089a8b0f
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.8.install.in
@@ -0,0 +1 @@
+usr/lib/libKokyu-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libkokyu-dev.install b/ACE/debian/libkokyu-dev.install
deleted file mode 100644
index 33ef826a07d..00000000000
--- a/ACE/debian/libkokyu-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/Kokyu
-usr/lib/libKokyu.so
-usr/lib/pkgconfig/Kokyu.pc
diff --git a/ACE/debian/libkokyu-dev.install.in b/ACE/debian/libkokyu-dev.install.in
new file mode 100644
index 00000000000..e86aea2bbf6
--- /dev/null
+++ b/ACE/debian/libkokyu-dev.install.in
@@ -0,0 +1,3 @@
+usr/include/Kokyu
+usr/lib/libKokyu.so usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/pkgconfig/Kokyu.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff --git a/ACE/debian/libnetsvcs-6.5.8.install b/ACE/debian/libnetsvcs-6.5.8.install
deleted file mode 100644
index c7a04b16213..00000000000
--- a/ACE/debian/libnetsvcs-6.5.8.install
+++ /dev/null
@@ -1 +0,0 @@
-../../netsvcs/lib/libnetsvcs-*.so usr/lib
diff --git a/ACE/debian/libnetsvcs-6.5.8.install.in b/ACE/debian/libnetsvcs-6.5.8.install.in
new file mode 100644
index 00000000000..36f10c3ec98
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.8.install.in
@@ -0,0 +1 @@
+../../netsvcs/lib/libnetsvcs-*.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/libnetsvcs-dev.install b/ACE/debian/libnetsvcs-dev.install.in
index 74d21fd30a7..d316686d81c 100644
--- a/ACE/debian/libnetsvcs-dev.install
+++ b/ACE/debian/libnetsvcs-dev.install.in
@@ -1,3 +1,3 @@
 ../../netsvcs/lib/*.h usr/include/netsvcs
 ../../netsvcs/lib/*_T.cpp usr/include/netsvcs
-../../netsvcs/lib/libnetsvcs.so usr/lib
+../../netsvcs/lib/libnetsvcs.so usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/ACE/debian/rules b/ACE/debian/rules
index 9e8457bce39..2742393faa4 100755
--- a/ACE/debian/rules
+++ b/ACE/debian/rules
@@ -49,6 +49,9 @@ ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}
 .PHONY: configure
 configure: configure-stamp
 configure-stamp:
+	for flname in debian/*.install.in; do \
+		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+                $$flname > $${flname%.in}; done
 	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
 	cp debian/config*.h $(ACE_ROOT)/ace/
 	cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config