| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From feccf89f08a455460668cf286151662e4c1557b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Thu, 20 Aug 2015 15:32:30 +0900 |
| 4 | Subject: [PATCH] Makefile.in: don't compile documentation |
| 5 | |
| 6 | The documentation file is not suitable for cross-compile, |
| 7 | Errors will occur: |
| 8 | | /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory |
| 9 | | ../../user/v9/drbdsetup xml-help disk-options > drbdsetup_xml-help_disk-options.xml |
| 10 | | /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory |
| 11 | | /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory |
| 12 | | make[1]: *** [drbdsetup_xml-help_new-resource.xml] Error 126 |
| 13 | |
| 14 | so we do not compile it. |
| 15 | |
| 16 | Upstream-Status: pending |
| 17 | |
| 18 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 19 | --- |
| 20 | Makefile.in | 2 +- |
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/Makefile.in b/Makefile.in |
| 24 | index 5365a2c..d5967d8 100644 |
| 25 | --- a/Makefile.in |
| 26 | +++ b/Makefile.in |
| 27 | @@ -45,7 +45,7 @@ WITH_84_SUPPORT = @WITH_84_SUPPORT@ |
| 28 | # and not in e.g. dash. I'm too lazy to fix it to be compatible. |
| 29 | SHELL=/bin/bash |
| 30 | |
| 31 | -SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts documentation/v83 documentation/v84 documentation/v9 |
| 32 | +SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts |
| 33 | |
| 34 | REL_VERSION := $(shell $(SED) -ne '/^AC_INIT/{s/^[^,]*, *\([^,]*\) *,.*/\1/;p;q}' configure.ac) |
| 35 | ifdef FORCE |
| 36 | -- |
| 37 | 1.8.4.2 |
| 38 | |