[gnome-initial-setup/wip/0.3: 3/4] Try and fix systemd directory craziness
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/wip/0.3: 3/4] Try and fix systemd directory craziness
- Date: Wed, 17 Oct 2012 15:25:38 +0000 (UTC)
commit 520b514ad976bfd4e2cfe99843a079e8a0430a87
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Oct 17 11:19:56 2012 -0400
Try and fix systemd directory craziness
configure.ac | 13 +++++++++++++
data/Makefile.am | 1 -
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f5fb6c6..9ca4d35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,19 @@ PKG_CHECK_MODULES(ISOCODES, iso-codes)
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
ISO_CODES=iso-codes
+# systemd
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [],
+ [with_systemdsystemunitdir=yes])
+if test "x$with_systemdsystemunitdir" = "xyes"; then
+ with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+fi
+if test "x$with_systemdsystemunitdir" != "xno"; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+
+
AC_SUBST(INITIAL_SETUP_CFLAGS)
AC_SUBST(INITIAL_SETUP_LIBS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 40aab1e..0f10445 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,7 +33,6 @@ desktop_DATA = \
setup-shell.desktop \
$(NULL)
-systemdsystemunitdir = /usr/lib/systemd/system
systemdsystemunit_DATA = gnome-initial-setup.service
EXTRA_DIST = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]