From 54b26e15d5c73af9b445a1fa44ce1d450c56c68e Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 6 Apr 2024 16:53:26 +0300 Subject: [PATCH] chore(build): Avoid duplicate macro definition (and don't steal autoconf archive prefix) --- configure.ac | 54 +++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index 14d2e881..7f6d6d83 100644 --- a/configure.ac +++ b/configure.ac @@ -122,39 +122,37 @@ AM_COND_IF([DEVELOPER], [ datarootdir="$(cd ..; pwd)" ]) -AC_DEFUN([AX_SCRIPT], [AC_CONFIG_FILES([scripts/$1], [chmod +x scripts/$1])]) - AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([rules/casile.mk]) AC_CONFIG_FILES([make-shell.zsh], [chmod +x make-shell.zsh]) -AC_DEFUN([AX_SCRIPT], [AC_CONFIG_FILES([scripts/$1], [chmod +x scripts/$1])]) +AC_DEFUN([CASILE_SCRIPT], [AC_CONFIG_FILES([scripts/$1], [chmod +x scripts/$1])]) # cd scripts; git ls-files '*.in' | sed -e 's/\.in$//' -AX_SCRIPT([branch2criticmark.zsh]) -AX_SCRIPT([casile-entry.zsh]) -AX_SCRIPT([cover_title.py]) -AX_SCRIPT([diff2marked.zsh]) -AX_SCRIPT([extract_references.js]) -AX_SCRIPT([figure_dash.pl]) -AX_SCRIPT([isbn_format.py]) -AX_SCRIPT([italic_reorder.pl]) -AX_SCRIPT([lazy_quotes.pl]) -AX_SCRIPT([link_verses.js]) -AX_SCRIPT([list_related_files.zsh]) -AX_SCRIPT([loadchapters.zsh]) -AX_SCRIPT([msword_escapes.pl]) -AX_SCRIPT([normalize_references.js]) -AX_SCRIPT([ordinal_spaces.pl]) -AX_SCRIPT([renumber_footnotes.pl]) -AX_SCRIPT([reorder_punctuation.pl]) -AX_SCRIPT([series_sort.lua]) -AX_SCRIPT([smart_quotes.pl]) -AX_SCRIPT([split_chapters.zsh]) -AX_SCRIPT([split_mdbook_src.zsh]) -AX_SCRIPT([stats.zsh]) -AX_SCRIPT([toc2breaks.lua]) -AX_SCRIPT([unicode_symbols.pl]) -AX_SCRIPT([worklog.zsh]) +CASILE_SCRIPT([branch2criticmark.zsh]) +CASILE_SCRIPT([casile-entry.zsh]) +CASILE_SCRIPT([cover_title.py]) +CASILE_SCRIPT([diff2marked.zsh]) +CASILE_SCRIPT([extract_references.js]) +CASILE_SCRIPT([figure_dash.pl]) +CASILE_SCRIPT([isbn_format.py]) +CASILE_SCRIPT([italic_reorder.pl]) +CASILE_SCRIPT([lazy_quotes.pl]) +CASILE_SCRIPT([link_verses.js]) +CASILE_SCRIPT([list_related_files.zsh]) +CASILE_SCRIPT([loadchapters.zsh]) +CASILE_SCRIPT([msword_escapes.pl]) +CASILE_SCRIPT([normalize_references.js]) +CASILE_SCRIPT([ordinal_spaces.pl]) +CASILE_SCRIPT([renumber_footnotes.pl]) +CASILE_SCRIPT([reorder_punctuation.pl]) +CASILE_SCRIPT([series_sort.lua]) +CASILE_SCRIPT([smart_quotes.pl]) +CASILE_SCRIPT([split_chapters.zsh]) +CASILE_SCRIPT([split_mdbook_src.zsh]) +CASILE_SCRIPT([stats.zsh]) +CASILE_SCRIPT([toc2breaks.lua]) +CASILE_SCRIPT([unicode_symbols.pl]) +CASILE_SCRIPT([worklog.zsh]) AC_OUTPUT