From: Armaan Bhojwani <me@armaanb.net>
Date: Thu, 10 Jun 2021 03:58:25 +0000 (-0400)
Subject: Install default config file into /usr/share/doc
X-Git-Tag: v1.0.0~10
X-Git-Url: https://git.armaanb.net/?p=chorizo.git;a=commitdiff_plain;h=eb903cd64c6272f8e7ce2520f97bb82847d20760

Install default config file into /usr/share/doc
---

diff --git a/Makefile b/Makefile
index 8528f6a..42185bb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ bindir = $(DESTDIR)$(exec_prefix)/bin
 libdir = $(DESTDIR)$(exec_prefix)/lib
 datadir = $(DESTDIR)$(prefix)/share
 mandir = $(DESTDIR)$(datadir)/man
-confdir = $(DESTDIR)/etc
+docdir = $(DESTDIR)$(datadir)/doc
 
 .PHONY: man clean uninstall install extensions
 
@@ -41,12 +41,13 @@ install: all
 		$(mandir) \
 		$(libdir)/chorizo/web_extensions \
 		$(datadir)/chorizo/user-scripts \
-		$(datadir)/applications
+		$(datadir)/applications \
+		$(docdir)/chorizo
 
 	cp chorizo $(bindir)/
 	cp man/*.1 $(mandir)/man1/
 	cp man/*.5 $(mandir)/man5/
-	cp chorizo.ini $(confdir)/
+	cp chorizo.ini $(docdir)/chorizo/
 	cp chorizo.desktop $(datadir)/applications/
 	cp -r extensions/*.so $(libdir)/chorizo/web_extensions/
 	cp -r user-scripts/* $(datadir)/chorizo/user-scripts/
@@ -58,7 +59,7 @@ uninstall:
 		$(mandir)/man5/chorizo* \
 		$(datadir)/chorizo \
 		$(datadir)/applications/chorizo.desktop \
-		$(confdir)/etc/chorizo.ini
+		$(docdir)/chorizo
 
 reinstall: uninstall install
 
diff --git a/man/chorizo-config.5.scd b/man/chorizo-config.5.scd
index d99d788..0b33364 100644
--- a/man/chorizo-config.5.scd
+++ b/man/chorizo-config.5.scd
@@ -5,10 +5,10 @@ _chorizo.ini_ - configuration file for *chorizo*(1)
 
 # DESCRIPTION
 _chorizo.ini_ is the system configuration file for the chorizo browser. The syntax
-is the standard GTK ini format. An example is provided at _/etc/chorizo.ini_, and
-user configuration should go in _~/.config/chorizo/chorizo.ini_, or your
-equivalent as set by $XDG_CONFIG_DIR. Settings must go under the relevant
-subsection.
+is the standard GTK ini format. An example is provided at
+_/usr/share/doc/chorizo/chorizo.ini_, and user configuration should go in
+_~/.config/chorizo/chorizo.ini_, or your equivalent as set by
+$XDG_CONFIG_DIR. Settings must go under the relevant subsection.
 
 # OPTIONS
 ## BROWSER