1
0

0005-build-fix-doc-build.patch 4.2 KB

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