chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: use autoconf'igured mkdir/ln/sed programs
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e562b18a2d178e519b6b3ef771624d15cfdefa12..c676712e969d4a907ba1677fcbfa23875a7e4deb 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-143,7
+143,8
@@
EXTRA_DIST += \
list.h \
securebits.h \
linux/auto_dev-ioctl.h \
list.h \
securebits.h \
linux/auto_dev-ioctl.h \
- initreq.h
+ initreq.h \
+ sd-daemon.h
dist_man_MANS = \
systemd.unit.5 \
dist_man_MANS = \
systemd.unit.5 \
@@
-207,11
+208,13
@@
test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
- logger.c
+ logger.c \
+ sd-daemon.c
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
- initctl.c
+ initctl.c \
+ sd-daemon.c
systemd_initctl_CPPFLAGS = \
$(AM_CPPFLAGS) \
systemd_initctl_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@
-248,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
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
-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' \
< $< > $@
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
@@
-278,12
+281,15
@@
endif
install-data-hook:
$(MKDIR_P) -m 0755 \
install-data-hook:
$(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir) \
+ $(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd \
$(DESTDIR)/cgroup/debug
$(DESTDIR)$(pkgsysconfdir)/system \
$(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)
DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)