Modified: CHANGELOG.md

Allow make to override etc dir
2022-02-11 22:08:10 +01:00 · 2022-02-11 22:07:26 +01:00 · 2022-02-11 21:47:34 +01:00 · 2022-02-11 21:46:56 +01:00
2 changed files with 13 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+## [5.2.0] - 2022-02-11
+### Added
+- Make option to override destination dir for configuration files. Needed for Homebrew.
+
+### Changed
+- Write permissions on installed scripts removed (0755 -> 0555). Homebrew was complaining.
+
 ## [5.1.0] - 2022-02-11
 ### Added
 - macos LaunchAgent support. Install with `make install-launchagent` and activate with `make activate-launchagent`. See [README.md](README.md) for details.
--- a/9
+++ b/9
@@ -50,6 +50,9 @@ LAUNCHAGENT_TARGET	= gui/$(UID)/$(LAUNCHAGENT)
 # package in a separate build directory (PREFIX).
 INSTALL_PREFIX := $(PREFIX)

+# Where to install persistent configuration files. Used by Homebrew.
+SYSCONFDIR := $(PREFIX)
+
 # Source directories.
 DIR_SCRIPT		= bin
 DIR_CONF		= etc/restic
@@ -82,7 +85,7 @@ BUILD_SRCS_LAUNCHAGENT	= $(addprefix $(BUILD_DIR)/, $(SRCS_LAUNCHAGENT))

 # Destination directories
 DEST_DIR_SCRIPT		= $(PREFIX)/$(DIR_SCRIPT)
-DEST_DIR_CONF		= $(PREFIX)/$(DIR_CONF)
+DEST_DIR_CONF		= $(SYSCONFDIR)/$(DIR_CONF)
 DEST_DIR_SYSTEMD	= $(PREFIX)/$(DIR_SYSTEMD)
 DEST_DIR_CRON		= $(PREFIX)/$(DIR_CRON)
 DEST_DIR_LAUNCHAGENT= $(HOME)/$(DIR_LAUNCHAGENT)
@@ -90,7 +93,7 @@ DEST_DIR_MAC_LOG	= $(HOME)/Library/Logs/restic

 # Destination file targets.
 DEST_TARGS_SCRIPT		= $(addprefix $(PREFIX)/, $(SRCS_SCRIPT))
-DEST_TARGS_CONF			= $(addprefix $(PREFIX)/, $(SRCS_CONF))
+DEST_TARGS_CONF			= $(addprefix $(SYSCONFDIR)/, $(SRCS_CONF))
 DEST_TARGS_SYSTEMD		= $(addprefix $(PREFIX)/, $(SRCS_SYSTEMD))
 DEST_TARGS_CRON			= $(addprefix $(PREFIX)/, $(SRCS_CRON))
 DEST_TARGS_LAUNCHAGENT	= $(addprefix $(HOME)/, $(SRCS_LAUNCHAGENT))
@@ -149,7 +152,7 @@ $(BUILD_DIR)/% : %
 # Install destination script files.
 $(DEST_DIR_SCRIPT)/%: $(BUILD_DIR_SCRIPT)/%
 	@${MKDIR_PARENTS} $@
-	install -m 0755 $< $@
+	install -m 0555 $< $@

 # Install destination conf files. Additionally backup existing files.
 $(DEST_DIR_CONF)/%: $(BUILD_DIR_CONF)/%
Author	SHA1	Message	Date
Erik Westrup	b838ebcb1a	Modified: CHANGELOG.md	2022-02-11 22:08:10 +01:00
Erik Westrup	8f118b6ddf	Allow make to override etc dir	2022-02-11 22:07:26 +01:00
Erik Westrup	fc01b56e1e	Modified: CHANGELOG.md	2022-02-11 21:47:34 +01:00
Erik Westrup	289016f8ea	No need to write perm on scripts	2022-02-11 21:46:56 +01:00