-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
autoconf looks in /proc/version for `Ubuntu` and on match overrides the `--with-systemdsystemunitdir` value set in `configureFlags` causing the build to fail. > mkdir -p '/lib/systemd/system' > mkdir: cannot create directory '/lib': Permission denied patch `configure.ac` to prevent the override when building on ubuntu
- Loading branch information
Showing
2 changed files
with
27 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/configure.ac b/configure.ac | ||
index d28c673..1cd0548 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -434,16 +434,7 @@ AC_CHECK_LIB([udev], [udev_device_new_from_device_id], [ | ||
LIBS="$LIBS $LIBUDEV_LIBS" | ||
]) | ||
|
||
-dnl Ubuntu's systemd pkg-config seems broken beyond repair. So: | ||
-kernelversion=`cat /proc/version || echo "non-linux"` | ||
-AS_CASE([$kernelversion], | ||
- [*Ubuntu*],[ | ||
- AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup]) | ||
- AC_SUBST([systemdsystemunitdir], [/lib/systemd/system]) | ||
- AM_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR], [true]) | ||
- ],[*],[ | ||
- SYSTEMD_SYSTEMUNITDIR | ||
-]) | ||
+SYSTEMD_SYSTEMUNITDIR | ||
|
||
AC_ARG_WITH(lockdir, | ||
[ --with-lockdir=DIR Old-school device lock files in DIR (/var/lock{/lockdev})], |