summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-16 18:34:31 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-16 18:34:31 +0200
commite9da3678fcfc774b325dc1eaa054d0e00028a1fc (patch)
tree54822b7c37909d6a70cbc62c8c9b2053aeb080d4
parent05a602f468a4f00d36ee7da73f13c0b014786fea (diff)
build-sys: use autoconf'igured mkdir/ln/sed programs
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac4
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index b8ccc8203a..c676712e96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -251,12 +251,12 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLA
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
systemd-initctl.service: units/systemd-initctl.service.in Makefile
- sed -e 's,@libexecdir\@,$(libexecdir),g' \
+ $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
systemd-logger.service: units/systemd-logger.service.in Makefile
- sed -e 's,@libexecdir\@,$(libexecdir),g' \
+ $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
@@ -287,8 +287,9 @@ install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd \
$(DESTDIR)/cgroup/debug
- rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
- ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+ ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
+ rm -f session && \
+ $(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
diff --git a/configure.ac b/configure.ac
index ea77db37da..1d2efc3ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,10 @@ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
])
+AC_PROG_MKDIR_P
+AC_PROG_LN_S
+AC_PROG_SED
+
AC_PROG_CC
AC_PROG_CC_C99
AM_PROG_CC_C_O