Skip to content

Commit

Permalink
Merge pull request #22 from mariux64/add-more-installation-targets
Browse files Browse the repository at this point in the history
Add more installation targets
  • Loading branch information
donald authored Feb 16, 2018
2 parents 06fca2a + b9029e5 commit c03e6b3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=.

Expand All @@ -68,6 +72,8 @@ 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)" \
udev_rulesdir="$(udev_rulesdir)" udev_helperdir="$(udev_helperdir)" \
srcdir="$(srcdir)" \
INSTALL="$(INSTALL)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" INSTALL_DATA="$(INSTALL_DATA)" \
DESTDIR="$(DESTDIR)" \
Expand Down
5 changes: 5 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit c03e6b3

Please sign in to comment.