Skip to content

Commit

Permalink
build-sys: always place user units in /usr/lib/systemd
Browse files Browse the repository at this point in the history
./configure --libexecdir=/usr/lib
kaysievers committed Apr 5, 2011
1 parent cdee58b commit 61fbbab
Showing 3 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d

# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
userunitdir=$(pkglibdir)/user
userunitdir=$(pkglibexecdir)/user
tmpfilesdir=$(sysconfdir)/tmpfiles.d
usergeneratordir=$(pkglibexecdir)/user-generators

@@ -145,7 +145,7 @@ rootlibexec_PROGRAMS = \
systemd-ac-power \
systemd-detect-virt \
systemd-sysctl \
systemd-binfmt
systemd-binfmt

systemgenerator_PROGRAMS = \
systemd-getty-generator
@@ -573,8 +573,8 @@ MANPAGES = \
man/locale.conf.5 \
man/os-release.5 \
man/modules-load.d.5 \
man/binfmt.d.5 \
man/sysctl.d.5
man/binfmt.d.5 \
man/sysctl.d.5

MANPAGES_ALIAS = \
man/reboot.8 \
@@ -1130,7 +1130,7 @@ SED_PROCESS = \
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-e 's,@pkglibdir\@,$(pkglibdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-e 's,@systemunitdir\@,$(systemunitdir),g' \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
2 changes: 0 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
@@ -26,8 +26,6 @@ F15:

* reload-or-try-restart man page uses word "fail"

* Move units from lib64 to lib

Features:

* write blog stories about:
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ else
run_versioned automake "$AM_VERSION" --copy --foreign --add-missing

if [ "x$1" != "xac" ]; then
CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --with-rootdir= "$@"
CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --with-rootdir= --libexecdir=/usr/lib "$@"
make clean
fi
fi

0 comments on commit 61fbbab

Please sign in to comment.