picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-sys: use autoconf'igured mkdir/ln/sed programs

Browse source
This commit is contained in:
Lennart Poettering 2010-05-16 18:34:31 +02:00
parent 05a602f468
commit e9da3678fc
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.am
View file

@ -251,12 +251,12 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLA
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS) systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
systemd-initctl.service: units/systemd-initctl.service.in Makefile 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' \ -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@ < $< > $@
systemd-logger.service: units/systemd-logger.service.in Makefile 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' \ -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@ < $< > $@
@ -287,8 +287,9 @@ install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/session \ $(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd \ $(DESTDIR)$(sysconfdir)/xdg/systemd \
$(DESTDIR)/cgroup/debug $(DESTDIR)/cgroup/debug
rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session rm -f session && \
$(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
DISTCHECK_CONFIGURE_FLAGS = \ DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)

4
configure.ac
View 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_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
AC_PROG_CC_C99 AC_PROG_CC_C99
AM_PROG_CC_C_O AM_PROG_CC_C_O