| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From: "Mike Holmes" <mike.holmes@linaro.org> |
| 2 | Date: Thu, 30 October 2014 16:21:03 -0500 |
| 3 | Subject: [PATCH] fixup-install-docdir |
| 4 | |
| 5 | The default configuration macros for CUnit install the documentation and |
| 6 | header files in locations not consistent with the OE filesystem layout. |
| 7 | So here we specify new locations which are consistent with OE filesystems. |
| 8 | |
| 9 | Upstream-Status: Inappropriate - configuration for OE build environment |
| 10 | |
| 11 | Signed-off-by: Mike Holmes <mike.holmes@linaro.org> |
| 12 | Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> |
| 13 | --- |
| 14 | |
| 15 | diff -uNr a/doc/headers/Makefile.am b/doc/headers/Makefile.am |
| 16 | --- a/doc/headers/Makefile.am 2014-10-30 22:06:29.704574162 +0100 |
| 17 | +++ b/doc/headers/Makefile.am 2014-10-30 22:07:43.578524791 +0100 |
| 18 | @@ -1,6 +1,6 @@ |
| 19 | ## Process this file with automake to produce Makefile.in |
| 20 | |
| 21 | -dochdrdir = $(prefix)/doc/@PACKAGE@/headers |
| 22 | +dochdrdir = $(docdir)/headers |
| 23 | |
| 24 | INCLUDE_FILES = \ |
| 25 | Automated.h \ |
| 26 | diff -uNr a/doc/Makefile.am b/doc/Makefile.am |
| 27 | --- a/doc/Makefile.am 2014-10-30 22:06:29.704574162 +0100 |
| 28 | +++ b/doc/Makefile.am 2014-10-30 22:07:01.461412166 +0100 |
| 29 | @@ -1,7 +1,5 @@ |
| 30 | ## Process this file with automake to produce Makefile.in |
| 31 | |
| 32 | -docdir = $(prefix)/doc/@PACKAGE@ |
| 33 | - |
| 34 | doc_DATA = \ |
| 35 | CUnit_doc.css \ |
| 36 | error_handling.html \ |