lib/autoproj/autobuild.rb in autoproj-1.8.2.b16 vs lib/autoproj/autobuild.rb in autoproj-1.8.2.b17

@@ -105,11 +105,11 @@
             pkg_autobuild.each do |pkg|
                 __depends_on__(pkg)
             end
             @os_packages |= pkg_os.to_set
         rescue Autoproj::OSDependencies::MissingOSDep
-            Autoproj.manifest.add_exclusion(name, "the #{name} osdep is not available on this operating system")
+            Autoproj.manifest.add_exclusion(self.name, "the #{name} osdep is not available on this operating system")
         end
 
         def depends_on_os_package(name)
             depends_on(name)
         end
@@ -368,14 +368,14 @@
 # information.
 def cmake_package(options, &block)
     package_common(:cmake, options) do |pkg|
         Autoproj.add_build_system_dependency 'cmake'
         yield(pkg) if block_given?
-        unless pkg.has_doc?
+        unless pkg.has_doc? && pkg.doc_dir
             pkg.with_doc do
-                doc_html = File.join('doc', 'html')
-                if File.directory? doc_html
+                doc_html = File.join(pkg.builddir, 'doc', 'html')
+                if File.directory?(doc_html)
                     pkg.doc_dir = doc_html
                 end
             end
         end
     end
@@ -392,12 +392,12 @@
 # information.
 def autotools_package(options, &block)
     package_common(:autotools, options) do |pkg|
         Autoproj.add_build_system_dependency 'autotools'
         yield(pkg) if block_given?
-        unless pkg.has_doc?
+        unless pkg.has_doc? && pkg.doc_dir
             pkg.with_doc do
-                doc_html = File.join('doc', 'html')
+                doc_html = File.join(pkg.builddir, 'doc', 'html')
                 if File.directory? doc_html
                     pkg.doc_dir = doc_html
                 end
             end
         end