chiark / gitweb /
build-sys: use autoconf'igured mkdir/ln/sed programs
authorLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 16:34:31 +0000 (18:34 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 16:34:31 +0000 (18:34 +0200)
Makefile.am
configure.ac

index b8ccc82..c676712 100644 (file)
@@ -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)
index ea77db3..1d2efc3 100644 (file)
@@ -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