From 2c634db6a2d231a15cdd6cda9b5cb6a6bfa2cd5f Mon Sep 17 00:00:00 2001 From: cage Date: Sun, 27 Dec 2020 13:53:52 +0100 Subject: [PATCH] - moved welcomebot script in the right directory when installed. --- Makefile.am | 2 ++ Makefile.in | 57 ++++++++++++++++++++++--------- {doc => modules}/welcome-bot.lisp | 0 3 files changed, 43 insertions(+), 16 deletions(-) rename {doc => modules}/welcome-bot.lisp (100%) diff --git a/Makefile.am b/Makefile.am index e82c639..dfefb3c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,8 @@ confdir = $(sysconfdir)/$(PACKAGE) dist_conf_DATA = etc/init.lisp etc/next-previous-open.lisp \ etc/default-theme.conf etc/shared.conf +dist_pkgdata_DATA = modules/welcome-bot.lisp + dist_man1_MANS = doc/tinmop.man $(PACKAGE): $(CONF_PATH_FILE) diff --git a/Makefile.in b/Makefile.in index b50a5fc..ebe7686 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,7 +117,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(dist_conf_DATA) $(dist_doc_DATA) \ - $(am__DIST_COMMON) + $(dist_pkgdata_DATA) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -151,7 +151,8 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(confdir)" "$(DESTDIR)$(docdir)" + "$(DESTDIR)$(confdir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(pkgdatadir)" SCRIPTS = $(bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -183,7 +184,7 @@ am__can_run_installinfo = \ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) -DATA = $(dist_conf_DATA) $(dist_doc_DATA) +DATA = $(dist_conf_DATA) $(dist_doc_DATA) $(dist_pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -399,6 +400,7 @@ confdir = $(sysconfdir)/$(PACKAGE) dist_conf_DATA = etc/init.lisp etc/next-previous-open.lisp \ etc/default-theme.conf etc/shared.conf +dist_pkgdata_DATA = modules/welcome-bot.lisp dist_man1_MANS = doc/tinmop.man all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -559,6 +561,27 @@ uninstall-dist_docDATA: @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || 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)$(pkgdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -872,7 +895,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(docdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -930,7 +953,7 @@ info: info-recursive info-am: install-data-am: install-dist_confDATA install-dist_docDATA \ - install-man + install-dist_pkgdataDATA install-man install-dvi: install-dvi-recursive @@ -977,7 +1000,8 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-binSCRIPTS uninstall-dist_confDATA \ - uninstall-dist_docDATA uninstall-man + uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ + uninstall-man uninstall-man: uninstall-man1 @@ -992,16 +1016,17 @@ uninstall-man: uninstall-man1 distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binSCRIPTS install-data install-data-am \ - install-dist_confDATA install-dist_docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-dist_confDATA \ - uninstall-dist_docDATA uninstall-man uninstall-man1 + install-dist_confDATA install-dist_docDATA \ + install-dist_pkgdataDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-am uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dist_confDATA uninstall-dist_docDATA \ + uninstall-dist_pkgdataDATA uninstall-man uninstall-man1 .PRECIOUS: Makefile diff --git a/doc/welcome-bot.lisp b/modules/welcome-bot.lisp similarity index 100% rename from doc/welcome-bot.lisp rename to modules/welcome-bot.lisp