jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Remove doc directory checks

Browse Source 
Originally, OpenAFS documentation was maintained in a separate tree, so
the doc directory may not be present when doing a build. However, the
docs have been maintained in-tree for many decades, and even though we
still distribute the doc tree in a separate tar archive, package
builders are accustomed to unpacking the docs archive in order to
package the man pages.

Clean up and simplify the top level makefile by removing the checks for
the doc directory. Unconditionally generate the Makefiles from
Makefile.in files in the doc tree.

Starting with this change, unpacking the doc tarball will be required
(no longer just optional) when building from source distribution
tarballs.

Change-Id: Idfadb33d365777a561dc64e7d336a49eb74b8b48
Reviewed-on: https://gerrit.openafs.org/15772
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
This commit is contained in:
Michael Meffie 2024-06-11 16:26:47 -04:00
parent 052f274c3c
commit 168badb037
2 changed files with 19 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile.in
View File

@ -407,9 +407,7 @@ tools: config audit volser vlserver
+${COMPILE_PART1} tools ${COMPILE_PART2}
man-pages: config
+if test -d "doc/man-pages" ; then \
cd doc/man-pages ${COMPILE_PART2} ; \
fi
cd doc/man-pages ${COMPILE_PART2}
#
# _depinstall targets - only build and install headers/sources that are
@ -942,13 +940,10 @@ distclean: clean
doc/xml/AdminGuide/Makefile \
doc/xml/QuickStartUnix/Makefile \
doc/xml/UserGuide/Makefile \
doc/xml/AdminRef/Makefile
if test -d doc/man-pages ; then \
/bin/rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
fi
if test -d doc/doxygen ; then \
/bin/rm -f doc/doxygen/Doxyfile ; \
fi
doc/xml/AdminRef/Makefile \
doc/man-pages/Makefile \
doc/man-pages/install-man \
doc/doxygen/Doxyfile
pristine: distclean
/bin/rm -f src/config/afsconfig.h.in configure configure-libafs \
@ -959,16 +954,12 @@ pristine: distclean
src/cf/ltoptions.m4 \
src/cf/ltsugar.m4 \
src/cf/ltversion.m4 \
src/cf/lt~obsolete.m4
if test -d doc/xml ; then \
/bin/rm -f doc/xml/mobi-fixup.xsl ; \
fi
if test -d doc/man-pages ; then \
/bin/rm -rf doc/man-pages/man1 \
doc/man-pages/man3 \
doc/man-pages/man5 \
doc/man-pages/man8 ; \
fi
src/cf/lt~obsolete.m4 \
doc/xml/mobi-fixup.xsl \
doc/man-pages/man1 \
doc/man-pages/man3 \
doc/man-pages/man5 \
doc/man-pages/man8 \
for i in doc/man-pages/pod*/*.pod.in; do \
/bin/rm -f $${i%.in}; \
done

37
configure.ac
View File

@ -20,37 +20,16 @@ OPENAFS_GSS
dnl Checks for summary
OPENAFS_SUMMARY_CHECK_NAMEI
AS_IF([test -d "$srcdir/doc/man-pages"],
[MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man"],
[MAN_MAKEFILE=])
AS_IF([test -f "$srcdir/doc/xml/AdminGuide/Makefile.in"],
[ADMINGUIDE_MAKEFILE="doc/xml/AdminGuide/Makefile"],
[ADMINGUIDE_MAKEFILE=])
AS_IF([test -f "$srcdir/doc/xml/QuickStartUnix/Makefile.in"],
[QSUNIX_MAKEFILE="doc/xml/QuickStartUnix/Makefile"],
[QSUNIX_MAKEFILE=])
AS_IF([test -f "$srcdir/doc/xml/UserGuide/Makefile.in"],
[USERGUIDE_MAKEFILE="doc/xml/UserGuide/Makefile"],
[USERGUIDE_MAKEFILE=])
AS_IF([test -f "$srcdir/doc/xml/AdminRef/Makefile.in"],
[ADMINREF_MAKEFILE="doc/xml/AdminRef/Makefile"],
[ADMINREF_MAKEFILE=])
AS_IF([test -f "$srcdir/doc/xml/mobi-fixup.xsl.in"],
[MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"],
[MOBI_FIXUP_XSL=])
AS_IF([test -f "$srcdir/doc/doxygen/Doxyfile.in"],
[DOXYFILE="doc/doxygen/Doxyfile"],
[DOXYFILE=])
AC_CONFIG_FILES([
Makefile
${MAN_MAKEFILE}
${ADMINGUIDE_MAKEFILE}
${QSUNIX_MAKEFILE}
${USERGUIDE_MAKEFILE}
${ADMINREF_MAKEFILE}
${MOBI_FIXUP_XSL}
${DOXYFILE}
doc/man-pages/Makefile
doc/man-pages/install-man
doc/xml/AdminGuide/Makefile
doc/xml/QuickStartUnix/Makefile
doc/xml/UserGuide/Makefile
doc/xml/AdminRef/Makefile
doc/xml/mobi-fixup.xsl
doc/doxygen/Doxyfile
src/afs/Makefile
src/afsd/Makefile
src/afsmonitor/Makefile