treewide: strictly separate builddir and srcdir

Building outside of source directory fails if --disable-doc is not
explicitly chosen.

This happens because generated files are sometimes expected in the
source directory, where they won't exist.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann 2024-01-11 18:46:01 +01:00
parent cb9f88ba94
commit 2b8895da5e
48 changed files with 53 additions and 52 deletions

View File

@ -9,18 +9,18 @@ README: README.xml
%.1: %.1.xml
$(XMLLINT) --nonet --xinclude --relaxng $(DOCBOOK_RNG) --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_srcdir)/doc/custom-man.xsl $<
$(XSLTPROC) -o $@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_builddir)/doc/custom-man.xsl $<
%.3: %.3.xml
$(XMLLINT) --nonet --xinclude --relaxng $(DOCBOOK_RNG) --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_srcdir)/doc/custom-man.xsl $<
$(XSLTPROC) -o $@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_builddir)/doc/custom-man.xsl $<
%.5: %.5.xml
$(XMLLINT) --nonet --xinclude --relaxng $(DOCBOOK_RNG) --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_srcdir)/doc/custom-man.xsl $<
$(XSLTPROC) -o $@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_builddir)/doc/custom-man.xsl $<
%.8: %.8.xml
$(XMLLINT) --nonet --xinclude --relaxng $(DOCBOOK_RNG) --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_srcdir)/doc/custom-man.xsl $<
$(XSLTPROC) -o $@ --path $(srcdir) --xinclude @STRINGPARAM_VENDORDIR@ @STRINGPARAM_PROFILECONDITIONS@ --nonet $(top_builddir)/doc/custom-man.xsl $<
#CLEANFILES += $(man_MANS) README

View File

@ -263,9 +263,10 @@ AC_ARG_ENABLE(txt_stylesheet,
TXT_STYLESHEET=$enableval, TXT_STYLESHEET=http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl)
${MKDIR_P} doc
AC_SUBST(TXT_STYLESHEET)
# It has to be TXT_STYLESHEET otherwise a html tree will be generated while generating all README files.
sed "s+HTML_STYLESHEET+$TXT_STYLESHEET+g" <doc/custom-html.xsl.in >doc/custom-html.xsl
sed "s+HTML_STYLESHEET+$TXT_STYLESHEET+g" <$srcdir/doc/custom-html.xsl.in >doc/custom-html.xsl
AC_ARG_ENABLE(pdf_stylesheet,
AS_HELP_STRING([--enable-pdf-stylesheet=FILE],[pdf stylesheet path @<:@default=http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl@:>@]),
@ -278,7 +279,7 @@ AC_ARG_ENABLE(man_stylesheet,
AC_SUBST(MAN_STYLESHEET)
sed "s+MAN_STYLESHEET+$MAN_STYLESHEET+g" <doc/custom-man.xsl.in >doc/custom-man.xsl
sed "s+MAN_STYLESHEET+$MAN_STYLESHEET+g" <$srcdir/doc/custom-man.xsl.in >doc/custom-man.xsl
AC_ARG_ENABLE(securedir,
AS_HELP_STRING([--enable-securedir=DIR],[path to location of PAMs @<:@default=$libdir/security@:>@]),

View File

@ -59,5 +59,5 @@ pam.d.5: pam.conf.5
pam_get_item.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml
pam_set_data.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml
pam.conf.5: pam.conf-desc.xml pam.conf-dir.xml pam.conf-syntax.xml
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -35,5 +35,5 @@ dist_secureconf_DATA = access.conf
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ tst_pam_canonicalize_user_retval_LDFLAGS = -Wl,--export-dynamic
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_debug_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_deny_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_echo_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -40,5 +40,5 @@ dist_sysconf_DATA = environment
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
environment.5: pam_env.conf.5.xml
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_exec_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_faildelay_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -53,5 +53,5 @@ faillock_SOURCES = main.c faillock.c faillock_config.c
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -37,5 +37,5 @@ securelib_LTLIBRARIES = pam_filter.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_ftp_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -35,5 +35,5 @@ dist_secureconf_DATA = group.conf
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_issue_la_LIBADD = $(top_builddir)/libpam/libpam.la $(SYSTEMD_LIBS)
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_keyinit_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_lastlog_la_LIBADD = $(top_builddir)/libpam/libpam.la -lutil
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -40,5 +40,5 @@ install-data-local:
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_listfile_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_localuser_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_loginuid_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBAUDIT@
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_mail_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -44,5 +44,5 @@ tst_pam_mkhomedir_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_motd_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -48,5 +48,5 @@ sbin_SCRIPTS = pam_namespace_helper
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_nologin_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_permit_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -51,5 +51,5 @@ tst_pam_pwhistory_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_rhosts_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_rootok_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -37,5 +37,5 @@ pam_selinux_check_LDADD = $(top_builddir)/libpam/libpam.la \
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -44,5 +44,5 @@ install-data-local:
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -29,5 +29,5 @@ pam_setquota_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_shells_la_LIBADD = $(top_builddir)/libpam/libpam.la $(ECONF_LIBS)
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -32,5 +32,5 @@ pam_stress_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_succeed_if_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -37,5 +37,5 @@ tst_pam_time_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -57,5 +57,5 @@ endif
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -28,5 +28,5 @@ securelib_LTLIBRARIES = pam_tty_audit.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_umask_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -79,5 +79,5 @@ endif
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -35,5 +35,5 @@ noinst_HEADERS = pam_userdb.h
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -34,5 +34,5 @@ pam_usertype_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -36,5 +36,5 @@ tst_pam_warn_retval_LDADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_wheel_la_LIBADD = $(top_builddir)/libpam/libpam.la
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif

View File

@ -33,5 +33,5 @@ pam_xauth_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@
if ENABLE_REGENERATE_MAN
dist_noinst_DATA = README
-include $(top_srcdir)/Make.xml.rules
-include $(top_builddir)/Make.xml.rules
endif