From 4f3786f8d0f839d5787433e9e27135a333a22976 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 4 Nov 2018 14:45:37 +0800
Subject: [PATCH] Build system: add extra sysconf directories

Closes #5235.
---
 Makefile.in         | 2 ++
 cmake/Install.cmake | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 620d224b1..3ae3660d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -612,6 +612,8 @@ install-force: all install-translations install-doc | show-datadir show-sysconfd
 	@echo "Creating sysconfdir tree"
 	$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
 	$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d
+	$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/completions
+	$v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/functions
 	$v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
 	@echo "Creating datadir tree"
 	$v $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index bd5e0dcd6..7b78495d3 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -86,8 +86,11 @@ INSTALL(TARGETS ${PROGRAMS}
 
 # $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
 # $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/conf.d
+# $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/completions
+# $v $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish/functions
 # $v $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
-FISH_CREATE_DIRS(${sysconfdir}/fish/conf.d)
+FISH_CREATE_DIRS(${sysconfdir}/fish/conf.d ${sysconfdir}/fish/completions
+    ${sysconfdir}/fish/functions)
 INSTALL(FILES etc/config.fish DESTINATION ${sysconfdir}/fish/)
 
 FISH_CREATE_DIRS(${rel_datadir}/fish ${rel_datadir}/fish/completions