build-sys: always place user units in /usr/lib/systemd
./configure --libexecdir=/usr/lib
This commit is contained in:
parent
cdee58bd38
commit
61fbbab869
10
Makefile.am
10
Makefile.am
|
@ -30,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
|
||||||
|
|
||||||
# Our own, non-special dirs
|
# Our own, non-special dirs
|
||||||
pkgsysconfdir=$(sysconfdir)/systemd
|
pkgsysconfdir=$(sysconfdir)/systemd
|
||||||
userunitdir=$(pkglibdir)/user
|
userunitdir=$(pkglibexecdir)/user
|
||||||
tmpfilesdir=$(sysconfdir)/tmpfiles.d
|
tmpfilesdir=$(sysconfdir)/tmpfiles.d
|
||||||
usergeneratordir=$(pkglibexecdir)/user-generators
|
usergeneratordir=$(pkglibexecdir)/user-generators
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ rootlibexec_PROGRAMS = \
|
||||||
systemd-ac-power \
|
systemd-ac-power \
|
||||||
systemd-detect-virt \
|
systemd-detect-virt \
|
||||||
systemd-sysctl \
|
systemd-sysctl \
|
||||||
systemd-binfmt
|
systemd-binfmt
|
||||||
|
|
||||||
systemgenerator_PROGRAMS = \
|
systemgenerator_PROGRAMS = \
|
||||||
systemd-getty-generator
|
systemd-getty-generator
|
||||||
|
@ -573,8 +573,8 @@ MANPAGES = \
|
||||||
man/locale.conf.5 \
|
man/locale.conf.5 \
|
||||||
man/os-release.5 \
|
man/os-release.5 \
|
||||||
man/modules-load.d.5 \
|
man/modules-load.d.5 \
|
||||||
man/binfmt.d.5 \
|
man/binfmt.d.5 \
|
||||||
man/sysctl.d.5
|
man/sysctl.d.5
|
||||||
|
|
||||||
MANPAGES_ALIAS = \
|
MANPAGES_ALIAS = \
|
||||||
man/reboot.8 \
|
man/reboot.8 \
|
||||||
|
@ -1130,7 +1130,7 @@ SED_PROCESS = \
|
||||||
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
|
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
|
||||||
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
|
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
|
||||||
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
|
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
|
||||||
-e 's,@pkglibdir\@,$(pkglibdir),g' \
|
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
|
||||||
-e 's,@systemunitdir\@,$(systemunitdir),g' \
|
-e 's,@systemunitdir\@,$(systemunitdir),g' \
|
||||||
-e 's,@userunitdir\@,$(userunitdir),g' \
|
-e 's,@userunitdir\@,$(userunitdir),g' \
|
||||||
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
|
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
|
||||||
|
|
2
TODO
2
TODO
|
@ -26,8 +26,6 @@ F15:
|
||||||
|
|
||||||
* reload-or-try-restart man page uses word "fail"
|
* reload-or-try-restart man page uses word "fail"
|
||||||
|
|
||||||
* Move units from lib64 to lib
|
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
|
||||||
* write blog stories about:
|
* write blog stories about:
|
||||||
|
|
|
@ -66,7 +66,7 @@ else
|
||||||
run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
|
run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
|
||||||
|
|
||||||
if [ "x$1" != "xac" ]; then
|
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
|
make clean
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue