chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
91216a6
)
Makefile.am: Fixed paths and cleaned up unneeded values.
author
Sven Eden
<yamakuzure@gmx.net>
Thu, 16 Feb 2017 15:46:53 +0000
(16:46 +0100)
committer
Sven Eden
<yamakuzure@gmx.net>
Tue, 14 Mar 2017 09:23:13 +0000
(10:23 +0100)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 0d2f986575dbad649e9bb3f86c59d40ab9a1f908..fe4b811c734758d48c62398226e364d6d9d09087 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-71,7
+71,6
@@
factory_pamdir = $(datadir)/factory/etc/pam.d
rootprefix=@rootprefix@
rootlibdir=@rootlibdir@
rootbindir=$(rootprefix)/bin
rootprefix=@rootprefix@
rootlibdir=@rootlibdir@
rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
EXTRA_DIST =
EXTRA_DIST =
@@
-123,8
+122,7
@@
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
- -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
- -DROOTPREFIX=\"$(rootprefix)\" \
+ -DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
@@
-133,8
+131,6
@@
AM_CPPFLAGS = \
-DREBOOT=\"$(REBOOT)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DREBOOT=\"$(REBOOT)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
- -DROOTLIBDIR=\"$(rootlibdir)\" \
- -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
@@
-193,8
+189,7
@@
AM_V_RM_0 = @echo " RM " $@;
# ------------------------------------------------------------------------------
rootbin_PROGRAMS =
# ------------------------------------------------------------------------------
rootbin_PROGRAMS =
-bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
dist_doc_DATA = \
README \
dist_doc_DATA = \
README \
@@
-474,7
+469,7
@@
dist_factory_pam_DATA = \
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
-
root
libexec_PROGRAMS += \
+
pkg
libexec_PROGRAMS += \
elogind-cgroups-agent
elogind_cgroups_agent_SOURCES = \
elogind-cgroups-agent
elogind_cgroups_agent_SOURCES = \
@@
-637,7
+632,7
@@
endif
noinst_LTLIBRARIES += \
libelogind-core.la
noinst_LTLIBRARIES += \
libelogind-core.la
-
root
libexec_PROGRAMS += \
+
pkg
libexec_PROGRAMS += \
elogind
loginctl_SOURCES = \
elogind
loginctl_SOURCES = \
@@
-764,7
+759,6
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
substitutions = \
# ------------------------------------------------------------------------------
substitutions = \
- '|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
@@
-933,7
+927,7
@@
endif
.PHONY: dist-check-help
.PHONY: dist-check-help
-dist-check-help: $(rootbin_PROGRAMS)
$(bin_PROGRAMS)
+dist-check-help: $(rootbin_PROGRAMS)
for i in $(abspath $^); do \
if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \
echo "$(basename $$i) --help output is too wide:"; \
for i in $(abspath $^); do \
if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \
echo "$(basename $$i) --help output is too wide:"; \