From 6dcb8e50c37d2e826a3551bd9f45893eab936ab4 Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 16 Feb 2018 12:43:48 +0100 Subject: [PATCH 1/2] Makefile: Add missing sysconfdir & systemdunitdir Whilst preparing the next commit, this tiny 'issue' was found. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 55d47041..8203624e 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ install: root_exec_prefix="$(root_exec_prefix)" root_bindir="$(root_bindir)" root_sbindir="$(root_sbindir)" \ usr_exec_prefix="$(usr_exec_prefix)" use_bindir="$(usr_bindir)" usr_sbindir="$(usr_sbindir)" \ usrlocal_exec_prefix="$(usrlocal_exec_prefix)" use_bindir="$(usrlocal_bindir)" usrlocal_sbindir="$(usrlocal_sbindir)" \ + sysconfdir="$(sysconfdir)" systemdunitdir="$(systemdunitdir)" \ srcdir="$(srcdir)" \ INSTALL="$(INSTALL)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" INSTALL_DATA="$(INSTALL_DATA)" \ DESTDIR="$(DESTDIR)" \ From b9029e57eb55d3aebad9bd8fc001ef8044148775 Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 16 Feb 2018 13:11:52 +0100 Subject: [PATCH 2/2] Add directories for tools that work with udev This opens the door for more tools to be integrated here (eg. barcoded.pl and kvm_monitor.pl). --- Makefile | 5 +++++ install.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 8203624e..baa247b3 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ # usr_exec_prefix usr_bindir usr_sbindir # usrlocal_exec_prefix usrlocal_bindir usrlocal_sbindir # sysconfdir systemdunitdir +# udev_rulesdir udev_helperdir # srcdir # INSTALL INSTALL_PROGRAM INSTALL_DATA # DESTDIR @@ -52,7 +53,10 @@ usrlocal_bindir=$(usrlocal_exec_prefix)/bin usrlocal_sbindir=$(usrlocal_exec_prefix)/sbin sysconfdir=$(prefix)/etc + systemdunitdir=$(sysconfdir)/systemd/system +udev_rulesdir=$(sysconfdir)/udev/rules.d +udev_helperdir=$(prefix)/lib/udev srcdir=. @@ -69,6 +73,7 @@ install: usr_exec_prefix="$(usr_exec_prefix)" use_bindir="$(usr_bindir)" usr_sbindir="$(usr_sbindir)" \ usrlocal_exec_prefix="$(usrlocal_exec_prefix)" use_bindir="$(usrlocal_bindir)" usrlocal_sbindir="$(usrlocal_sbindir)" \ sysconfdir="$(sysconfdir)" systemdunitdir="$(systemdunitdir)" \ + udev_rulesdir="$(udev_rulesdir)" udev_helperdir="$(udev_helperdir)" \ srcdir="$(srcdir)" \ INSTALL="$(INSTALL)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" INSTALL_DATA="$(INSTALL_DATA)" \ DESTDIR="$(DESTDIR)" \ diff --git a/install.sh b/install.sh index 7432e51e..35be7381 100755 --- a/install.sh +++ b/install.sh @@ -27,7 +27,10 @@ fi : ${usrlocal_sbindir:=$usrlocal_exec_prefix/sbin} : ${sysconfdir:=$prefix/etc} + : ${systemdunitdir:=$sysconfdir/systemd/system} +: ${udev_rulesdir:=$sysconfdir/udev/rules.d} +: ${udev_helperdir:=$prefix/lib/udev} : ${INSTALL:=install -v} : ${INSTALL_PROGRAM:=$INSTALL} @@ -72,6 +75,8 @@ mkdir -p "$DESTDIR$usr_bindir" mkdir -p "$DESTDIR$usr_sbindir" mkdir -p "$DESTDIR$systemdunitdir" mkdir -p "$DESTDIR$usrlocal_bindir" +mkdir -p "$DESTDIR$udev_rulesdir" +mkdir -p "$DESTDIR$udev_helperdir" install_exec make-automaps/make-automaps "$DESTDIR$usr_sbindir/make-automaps" install_data misc_systemd_units/automount.service "$DESTDIR$systemdunitdir/automount.service"