Permalink
Browse files

Merge pull request #166 from v4hn/kmod-docbook-xml

kmod: cleanup and fixed docbook dependency
  • Loading branch information...
2 parents a717174 + 4eb3738 commit d3f8c9768847a8ee5353dccf256ec904a3cf2fb3 @Ratler Ratler committed Nov 12, 2012
Showing with 3 additions and 9 deletions.
  1. +1 −7 kernel/kmod/BUILD
  2. +0 −1 kernel/kmod/CONFLICTS
  3. +2 −1 kernel/kmod/DEPENDS
View
@@ -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
View
@@ -1,2 +1 @@
conflicts module-init-tools
-
View
@@ -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"

0 comments on commit d3f8c97

Please sign in to comment.