Fri Nov 23 09:39:17 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * debian/TAO_ACE.mwc:
        * debian/libace-6.1.6.docs:
        * debian/libace-dev.docs:
        * debian/libace-dev.install:
        * debian/libace-doc.docs:
        * debian/libtao-2.1.6.docs:
        * debian/libtao-dev.docs:
        * debian/libtao-doc.docs:
          More install fixes

9 files changed, 63 insertions, 25 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 21441bc71fd..0b509b1835a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Fri Nov 23 09:39:17 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debian/TAO_ACE.mwc:
+        * debian/libace-6.1.6.docs:
+        * debian/libace-dev.docs:
+        * debian/libace-dev.install:
+        * debian/libace-doc.docs:
+        * debian/libtao-2.1.6.docs:
+        * debian/libtao-dev.docs:
+        * debian/libtao-doc.docs:
+          More install fixes
+
 Fri Nov 23 08:07:23 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ETCL/ETCL_Constraint.inl:
diff --git a/ACE/debian/TAO_ACE.mwc b/ACE/debian/TAO_ACE.mwc
new file mode 100644
index 00000000000..29b14685de9
--- /dev/null
+++ b/ACE/debian/TAO_ACE.mwc
@@ -0,0 +1,25 @@
+// -*- MPC -*-
+// $Id$
+
+workspace {
+  $(ACE_ROOT)/ace
+  $(ACE_ROOT)/apps/gperf/src
+  $(ACE_ROOT)/ACEXML/common
+  $(ACE_ROOT)/ACEXML/parser/parser
+  $(ACE_ROOT)/ACEXML/apps/svcconf
+  $(ACE_ROOT)/Kokyu/Kokyu.mpc
+  $(ACE_ROOT)/protocols
+  $(ACE_ROOT)/netsvcs/lib
+  tao
+  TAO_IDL
+  utils
+  orbsvcs
+  exclude {
+    $(ACE_ROOT)/protocols/tests
+    $(ACE_ROOT)/protocols/examples
+    orbsvcs/tests
+    orbsvcs/performance-tests
+    orbsvcs/examples
+    orbsvcs/DevGuideExamples
+  }
+}
diff --git a/ACE/debian/libace-6.1.6.docs b/ACE/debian/libace-6.1.6.docs
index 3bdab5b0089..4bf3b4f3b68 100644
--- a/ACE/debian/libace-6.1.6.docs
+++ b/ACE/debian/libace-6.1.6.docs
@@ -1,8 +1,8 @@
-README
-VERSION
-AUTHORS
-docs/FAQ
-PROBLEM-REPORT-FORM
-THANKS
-VERSION
-NEWS
+usr/share/ace/README
+usr/share/ace/VERSION
+usr/share/ace/AUTHORS
+usr/share/ace/docs/FAQ
+usr/share/ace/PROBLEM-REPORT-FORM
+usr/share/ace/THANKS
+usr/share/ace/VERSION
+usr/share/ace/NEWS
diff --git a/ACE/debian/libace-dev.docs b/ACE/debian/libace-dev.docs
index b62a1c98d24..30e394ee40f 100644
--- a/ACE/debian/libace-dev.docs
+++ b/ACE/debian/libace-dev.docs
@@ -1,7 +1,7 @@
-README
-VERSION
-AUTHORS
-docs/FAQ
-PROBLEM-REPORT-FORM
-THANKS
-VERSION
+usr/share/ace/README
+usr/share/ace/VERSION
+usr/share/ace/AUTHORS
+usr/share/ace/docs/FAQ
+usr/share/ace/PROBLEM-REPORT-FORM
+usr/share/ace/THANKS
+usr/share/ace/VERSION
diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install
index faf0c1c7cc1..dc4d18708d6 100644
--- a/ACE/debian/libace-dev.install
+++ b/ACE/debian/libace-dev.install
@@ -20,3 +20,4 @@ usr/lib/libACE_ETCL.so
 usr/lib/pkgconfig/ACE.pc
 usr/lib/pkgconfig/ACE_ETCL.pc
 usr/lib/pkgconfig/ACE_ETCL_Parser.pc
+usr/lib/ace/include/makeinclude
\ No newline at end of file
diff --git a/ACE/debian/libace-doc.docs b/ACE/debian/libace-doc.docs
index df1bbe42d1d..5b383adddd7 100644
--- a/ACE/debian/libace-doc.docs
+++ b/ACE/debian/libace-doc.docs
@@ -1,2 +1,2 @@
-docs
-html/libace-doc/*
+usr/share/ace/docs
+usr/share/ace/html/libace-doc/*
diff --git a/ACE/debian/libtao-2.1.6.docs b/ACE/debian/libtao-2.1.6.docs
index 6ed40bf21ea..e1d49c71d0a 100644
--- a/ACE/debian/libtao-2.1.6.docs
+++ b/ACE/debian/libtao-2.1.6.docs
@@ -1,4 +1,4 @@
-TAO/README
-TAO/VERSION
-TAO/PROBLEM-REPORT-FORM
-TAO/NEWS
+usr/share/tao/README
+usr/share/tao/VERSION
+usr/share/tao/PROBLEM-REPORT-FORM
+usr/share/tao/NEWS
diff --git a/ACE/debian/libtao-dev.docs b/ACE/debian/libtao-dev.docs
index 1e1354684a1..7213d4a2744 100644
--- a/ACE/debian/libtao-dev.docs
+++ b/ACE/debian/libtao-dev.docs
@@ -1,3 +1,3 @@
-TAO/README
-TAO/VERSION
-TAO/PROBLEM-REPORT-FORM
+usr/share/tao/README
+usr/share/tao/VERSION
+usr/share/tao/PROBLEM-REPORT-FORM
diff --git a/ACE/debian/libtao-doc.docs b/ACE/debian/libtao-doc.docs
index 8f1da4a785d..2128c0fb732 100644
--- a/ACE/debian/libtao-doc.docs
+++ b/ACE/debian/libtao-doc.docs
@@ -1,2 +1,2 @@
-TAO/docs
+usr/share/tao/docs
 html/libtao-doc/*