[Lunar-commits] <moonbase> discover: No docbook for you!

Moritz Heiber moe at lunar-linux.org
Tue Apr 29 19:49:40 CEST 2008


commit a95b3a87ab949e3e891bcba619893825f81b75ee
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Tue Apr 29 19:49:40 2008 +0200

    discover: No docbook for you!
    
    (You can, however, install the manpages if you wish to
    do so)
---
 utils/discover/BUILD   |   11 ++++++++++-
 utils/discover/DEPENDS |    3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/utils/discover/BUILD b/utils/discover/BUILD
index 6e57f49..2691994 100644
--- a/utils/discover/BUILD
+++ b/utils/discover/BUILD
@@ -1,16 +1,25 @@
 (
+  if ! in_depends discover docbook-4.1 ; then
+    patch_it $SOURCE2 0
+  fi
+
   if module_installed docbook-utils; then
     sedit 's:${DOCBOOKTOMAN}:docbook2man:g' doctools/docbook.mk
   else
     sedit 's:docbook-to-man:echo:' doctools/docbook.mk
   fi &&
-  OPTS="$OPTS --disable-curl" &&
+
+  OPTS="$OPTS --disable-curl"
+
   default_config &&
   make &&
   make check &&
   prepare_install &&
+
   rm -f /usr/sbin/discover-modprobe &&
+
   make install &&
+
   mv /usr/sbin/discover-modprobe /sbin/ &&
   ln -sf /sbin/discover-modprobe /usr/sbin/discover-modprobe &&
   ln -sf ../init.d/discover /etc/rcS.d/S20discover
diff --git a/utils/discover/DEPENDS b/utils/discover/DEPENDS
index 3319f72..9aaad3a 100644
--- a/utils/discover/DEPENDS
+++ b/utils/discover/DEPENDS
@@ -1,4 +1,5 @@
-depends docbook-4.1
 depends discover-data
 depends expat
 depends check
+
+optional_depends "docbook-4.1" "" "" "to install manpages"


More information about the Lunar-commits mailing list