aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile.in
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-04-05 22:22:12 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-04-06 09:33:09 +0800
commit200a10e78d0df7001c6c2a7c71e7139cccf4277c (patch)
treec4f7027bd4948441a4c229b0b346684d5c7b6589 /Makefile.in
parent9e93ddc0978644d0670e192052619bb4710041e7 (diff)
Rename "snippets" to "conf" internally, and document them as snippets
Discussed in #2896.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index b176c5f6..ea008211 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ docdir = @docdir@
localedir = @localedir@
extra_completionsdir = @extra_completionsdir@
extra_functionsdir = @extra_functionsdir@
-extra_snippetsdir = @extra_snippetsdir@
+extra_confdir = @extra_confdir@
#
# pcre2
@@ -472,7 +472,7 @@ doc.h: $(HDR_FILES)
-e "s,@docdir\@,$(docdir),g" \
-e "s,@extra_completionsdir\@,$(extra_completionsdir),g" \
-e "s,@extra_functionsdir\@,$(extra_functionsdir),g" \
- -e "s,@extra_snippetsdir\@,$(extra_snippetsdir),g" \
+ -e "s,@extra_confdir\@,$(extra_confdir),g" \
-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
-e "s,@prefix\@,$(prefix),g" \
-e "s,@fish_build_version\@,$(FISH_BUILD_VERSION),g" \
@@ -665,7 +665,7 @@ install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
$(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
$(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
- $(INSTALL) -m 755 -d $(DESTDIR)$(extra_snippetsdir)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man/man1
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools