0005-build-fix-doc-build.patch (4306B)
1 From 1563e57ea8ab9d123f765129a6840929ef58ff7a Mon Sep 17 00:00:00 2001 2 From: Yousong Zhou <yszhou4tech@gmail.com> 3 Date: Wed, 17 Jun 2015 20:38:41 +0800 4 Subject: [PATCH 5/7] build: fix doc build. 5 6 * Makefile.am: ignore doc/ directory if not ENABLE_REGENERATE_MAN 7 * doc/adg/Makefile.am: remove check on ENABLE_REGENERATE_MAN 8 * doc/man/Makefile.am: ditto 9 * doc/mwg/Makefile.am: ditto 10 * doc/sag/Makefile.am: ditto 11 * doc/specs/Makefile.am: ignore CC from command line 12 13 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> 14 --- 15 Makefile.am | 5 ++++- 16 doc/adg/Makefile.am | 3 --- 17 doc/man/Makefile.am | 2 -- 18 doc/mwg/Makefile.am | 3 --- 19 doc/sag/Makefile.am | 2 -- 20 doc/specs/Makefile.am | 2 +- 21 6 files changed, 5 insertions(+), 12 deletions(-) 22 23 diff --git a/Makefile.am b/Makefile.am 24 index 3db4e37..5e6592a 100644 25 --- a/Makefile.am 26 +++ b/Makefile.am 27 @@ -4,7 +4,10 @@ 28 29 AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news 30 31 -SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests 32 +if ENABLE_REGENERATE_MAN 33 + MAYBE_DOC = doc 34 +endif 35 +SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests $(MAYBE_DOC) 36 37 CLEANFILES = *~ 38 39 diff --git a/doc/adg/Makefile.am b/doc/adg/Makefile.am 40 index 77bd7a9..bec5edc 100644 41 --- a/doc/adg/Makefile.am 42 +++ b/doc/adg/Makefile.am 43 @@ -9,7 +9,6 @@ EXTRA_DIST = $(XMLS) 44 XMLS = Linux-PAM_ADG.xml $(shell ls $(srcdir)/pam_*.xml) 45 DEP_XMLS = $(shell ls $(top_srcdir)/doc/man/pam_*.xml) 46 47 -if ENABLE_REGENERATE_MAN 48 MAINTAINERCLEANFILES = Linux-PAM_ADG.txt Linux-PAM_ADG.pdf html/*.html 49 50 all: Linux-PAM_ADG.txt html/Linux-PAM_ADG.html Linux-PAM_ADG.pdf 51 @@ -51,8 +50,6 @@ html/Linux-PAM_ADG.html: $(XMLS) $(DEP_XMLS) 52 distclean-local: 53 -rm -rf html Linux-PAM_ADG.txt Linux-PAM_ADG.pdf 54 55 -endif 56 - 57 install-data-local: 58 $(mkinstalldirs) $(DESTDIR)$(docdir) 59 $(mkinstalldirs) $(DESTDIR)$(pdfdir) 60 diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am 61 index 78c891d..b1dc421 100644 62 --- a/doc/man/Makefile.am 63 +++ b/doc/man/Makefile.am 64 @@ -45,7 +45,6 @@ XMLS = pam.3.xml pam.8.xml \ 65 misc_conv.3.xml pam_misc_paste_env.3.xml pam_misc_drop_env.3.xml \ 66 pam_misc_setenv.3.xml 67 68 -if ENABLE_REGENERATE_MAN 69 PAM.8: pam.8 70 pam_get_authtok_noverify.3: pam_get_authtok.3 71 pam_get_authtok_verify.3: pam_get_authtok.3 72 @@ -60,4 +59,3 @@ pam_get_item.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml 73 pam_set_data.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml 74 pam.conf.5: pam.conf-desc.xml pam.conf-dir.xml pam.conf-syntax.xml 75 -include $(top_srcdir)/Make.xml.rules 76 -endif 77 diff --git a/doc/mwg/Makefile.am b/doc/mwg/Makefile.am 78 index 2bbb2d0..f57e297 100644 79 --- a/doc/mwg/Makefile.am 80 +++ b/doc/mwg/Makefile.am 81 @@ -9,7 +9,6 @@ EXTRA_DIST = $(XMLS) 82 XMLS = Linux-PAM_MWG.xml $(shell ls $(srcdir)/pam_*.xml) 83 DEP_XMLS = $(shell ls $(top_srcdir)/doc/man/pam_*.xml) 84 85 -if ENABLE_REGENERATE_MAN 86 MAINTAINERCLEANFILES = Linux-PAM_MWG.txt Linux-PAM_MWG.pdf html/*.html 87 88 all: Linux-PAM_MWG.txt html/Linux-PAM_MWG.html Linux-PAM_MWG.pdf 89 @@ -51,8 +50,6 @@ html/Linux-PAM_MWG.html: $(XMLS) $(DEP_XMLS) 90 distclean-local: 91 -rm -rf html Linux-PAM_MWG.txt Linux-PAM_MWG.pdf 92 93 -endif 94 - 95 install-data-local: 96 $(mkinstalldirs) $(DESTDIR)$(docdir) 97 $(mkinstalldirs) $(DESTDIR)$(pdfdir) 98 diff --git a/doc/sag/Makefile.am b/doc/sag/Makefile.am 99 index 31816aa..a8b655f 100644 100 --- a/doc/sag/Makefile.am 101 +++ b/doc/sag/Makefile.am 102 @@ -10,7 +10,6 @@ XMLS = Linux-PAM_SAG.xml $(shell ls $(srcdir)/pam_*.xml) 103 104 DEP_XMLS = $(shell ls $(top_srcdir)/modules/pam_*/pam_*.xml) 105 106 -if ENABLE_REGENERATE_MAN 107 MAINTAINERCLEANFILES = Linux-PAM_SAG.txt Linux-PAM_SAG.pdf html/*.html 108 109 all: Linux-PAM_SAG.txt html/Linux-PAM_SAG.html Linux-PAM_SAG.pdf 110 @@ -51,7 +50,6 @@ html/Linux-PAM_SAG.html: $(XMLS) $(DEP_XMLS) 111 112 distclean-local: 113 -rm -rf html Linux-PAM_SAG.txt Linux-PAM_SAG.pdf 114 -endif 115 116 install-data-local: 117 $(mkinstalldirs) $(DESTDIR)$(docdir) 118 diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am 119 index 99ecc70..39c850f 100644 120 --- a/doc/specs/Makefile.am 121 +++ b/doc/specs/Makefile.am 122 @@ -11,7 +11,7 @@ draft-morgan-pam-current.txt: padout draft-morgan-pam.raw 123 124 AM_YFLAGS = -d 125 126 -CC = @CC_FOR_BUILD@ 127 +override CC = @CC_FOR_BUILD@ 128 CPPFLAGS = @BUILD_CPPFLAGS@ 129 CFLAGS = @BUILD_CFLAGS@ 130 LDFLAGS = @BUILD_LDFLAGS@ 131 -- 132 1.7.10.4 133