$NetBSD: patch-ca,v 1.11 2023/03/11 18:16:17 leot Exp $ - Introduce $egdir and install all configuration files in it, in order to properly use CONF_FILES to manage configuration files for pkgsrc. - Adjust TEST_ENVIRONMENT in order to use $egdir instead of $nmhetcdir and adjust $nmhetcdirinst to fix the `mhparam etcdir' test. --- Makefile.in.orig 2023-01-01 16:30:07.000000000 +0000 +++ Makefile.in @@ -988,6 +988,7 @@ smtpserver = @smtpserver@ srcdir = @srcdir@ supported_locks = @supported_locks@ sysconfdir = @sysconfdir@ +egdir = @prefix@/share/examples/nmh target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -1003,8 +1004,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_bui CURL_USER_AGENT='@CURL_USER_AGENT@' \ MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \ nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \ - mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \ - nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \ + mandir="$(mandir)" nmhetcdir="$(egdir)" \ + nmhetcdirinst="$(nmhetcdir)" \ supported_locks="$(supported_locks)" \ default_locking="${default_locking}" \ MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \ @@ -2756,10 +2757,10 @@ uninstall-dist_docs_contribSCRIPTS: dir='$(DESTDIR)$(docs_contribdir)'; $(am__uninstall_files_from_dir) install-dist_nmhetcSCRIPTS: $(dist_nmhetc_SCRIPTS) @$(NORMAL_INSTALL) - @list='$(dist_nmhetc_SCRIPTS)'; test -n "$(nmhetcdir)" || list=; \ + @list='$(dist_nmhetc_SCRIPTS)'; test -n "$(egdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -2778,8 +2779,8 @@ install-dist_nmhetcSCRIPTS: $(dist_nmhet while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(nmhetcdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(nmhetcdir)$$dir" || exit $$?; \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(egdir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(egdir)$$dir" || exit $$?; \ } \ ; done @@ -4871,18 +4872,18 @@ uninstall-dist_docs_contribDATA: dir='$(DESTDIR)$(docs_contribdir)'; $(am__uninstall_files_from_dir) install-dist_nmhetcDATA: $(dist_nmhetc_DATA) @$(NORMAL_INSTALL) - @list='$(dist_nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \ + @list='$(dist_nmhetc_DATA)'; test -n "$(egdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ done uninstall-dist_nmhetcDATA: @@ -4892,18 +4893,18 @@ uninstall-dist_nmhetcDATA: dir='$(DESTDIR)$(nmhetcdir)'; $(am__uninstall_files_from_dir) install-nmhetcDATA: $(nmhetc_DATA) @$(NORMAL_INSTALL) - @list='$(nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \ + @list='$(nmhetc_DATA)'; test -n "$(egdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ done uninstall-nmhetcDATA: @@ -5242,7 +5243,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ $(HEADERS) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(nmhlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docs_contribdir)" "$(DESTDIR)$(nmhetcdir)" "$(DESTDIR)$(nmhlibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docs_contribdir)" "$(DESTDIR)$(nmhetcdir)" "$(DESTDIR)$(nmhetcdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(nmhlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docs_contribdir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(nmhlibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docs_contribdir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(egdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am