[Lunar-commits] <moonbase-other> Merge pull request #335 from v4hn/cunit-doc-fix

[Dennis Veatch]

commit e32e2585d848c7e2f9b545e790ff8f569384edfb
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Tue, 12 Aug 2014 10:28:05 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/e32e2585d848c7e2f9b545e790ff8f569384edfb

Merge pull request #335 from v4hn/cunit-doc-fix

CUnit: fix installation to /usr/doc and simplify BUILD
---
  libs/CUnit/BUILD     | +1/-6     
  libs/CUnit/PRE_BUILD | +4/-1     
  2 files changed, 5 insertions(+), 7 deletions(-)

--- a/libs/CUnit/BUILD
+++ b/libs/CUnit/BUILD
@@ -1,9 +1,4 @@
-
   mv configure.in configure.ac &&
-  touch config.h.in &&
-  libtoolize &&
-  aclocal &&
-  automake -a -c &&
-  autoreconf &&
+  autoreconf -i &&
   
   default_build
--- a/libs/CUnit/PRE_BUILD
+++ b/libs/CUnit/PRE_BUILD
@@ -1,4 +1,7 @@
 default_pre_build &&
 
 sedit "s:\(docdir =\) .*:\1 @docdir@:" doc/Makefile.in &&
-sedit "s:\(dochdrdir =\) .*:\1 \$(prefix)/include/@PACKAGE@:" doc/headers/Makefile.in
+sedit "/docdir/ d" doc/Makefile.am &&
+
+sedit "s:\(dochdrdir =\) .*:\1 \$(prefix)/include/@PACKAGE@:" doc/headers/Makefile.in &&
+sedit "s:\(dochdrdir =\) .*:\1 @docdir@/headers:" doc/headers/Makefile.am