[Lunar-commits] <moonbase-core> kmod: cleanup and fixed docbook dependency

v4hn me at v4hn.de
Sun Nov 11 18:04:51 CET 2012


commit 4eb37381f3964063f8a96014ccf335a134ba9ff1
Author: v4hn <me at v4hn.de>
Date: Sun, 11 Nov 2012 09:04:51 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/4eb37381f3964063f8a96014ccf335a134ba9ff1

kmod: cleanup and fixed docbook dependency
---
  kernel/kmod/BUILD     | +1/-7     
  kernel/kmod/CONFLICTS | +0/-1     
  kernel/kmod/DEPENDS   | +2/-1     
  3 files changed, 3 insertions(+), 9 deletions(-)

--- a/kernel/kmod/BUILD
+++ b/kernel/kmod/BUILD
@@ -1,11 +1,6 @@
 (
 
-  if ! module_installed docbook-xml; then
-     sedit '/man\/Makefile/d' configure.ac  &&
-     sedit 's/man//' Makefile.am
-  fi &&
-
-  sedit "s:\$(libdir)/pkgconfig:/usr/lib/pkgconfig:" Makefile.am  Makefile.in  &&
+  sedit "s:\$(libdir)/pkgconfig:/usr/lib/pkgconfig:" Makefile.in  &&
 
   OPTS+=" --with-zlib"  &&
 
@@ -15,7 +10,6 @@
                --includedir=/usr/include \
                $OPTS  &&
 
-  sedit "s:\${prefix}/include:/usr/include:"  Makefile  &&
   default_make  &&
 
 # add symlinks to kmod
--- a/kernel/kmod/CONFLICTS
+++ b/kernel/kmod/CONFLICTS
@@ -1,2 +1 @@
 conflicts module-init-tools
-
--- a/kernel/kmod/DEPENDS
+++ b/kernel/kmod/DEPENDS
@@ -2,4 +2,5 @@ depends  zlib
 depends  automake
 depends  libtool
 
-optional_depends  "xz"  "--with-xz"  ""  "support for xz compressed modules"
+optional_depends  "xz"  "--with-xz"  "--without-xz"  "support for xz compressed modules"
+optional_depends  "docbook-xml" "" "--disable-manpages" "build manpages"




More information about the Lunar-commits mailing list