blob: 775a6e6609e64b2b49ffdcf14ab8b12d8c912bee (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
--- systemd-232.orig/Makefile.am 2016-11-03 18:16:42.000000000 +0100
+++ systemd-232/Makefile.am 2016-12-27 19:28:30.933147951 +0100
@@ -303,9 +303,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
- dir=$(userunitdir) && $(install-relative-aliases)
+ dir=$(userunitdir) && $(install-aliases)
set -- $(GENERAL_ALIASES) && \
- dir= && $(install-relative-aliases)
+ dir= && $(install-aliases)
define install-aliases
while [ -n "$$1" ]; do \
@@ -316,15 +316,6 @@ define install-aliases
done
endef
-define install-relative-aliases
- while [ -n "$$1" ]; do \
- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
- rm -f $(DESTDIR)$$dir/$$2 && \
- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
- shift 2 || exit $$?; \
- done
-endef
-
install-touch-usr-hook:
touch -c $(DESTDIR)/$(prefix)
@@ -5014,39 +5005,6 @@ EXTRA_DIST += \
src/timesync/timesyncd.conf.in
# ------------------------------------------------------------------------------
-test_nss_SOURCES = \
- src/test/test-nss.c
-
-test_nss_LDADD = \
- libsystemd-internal.la \
- libbasic.la \
- -ldl
-
-manual_tests += \
- test-nss
-
-# ------------------------------------------------------------------------------
-libnss_systemd_la_SOURCES = \
- src/nss-systemd/nss-systemd.sym \
- src/nss-systemd/nss-systemd.c
-
-libnss_systemd_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -module \
- -export-dynamic \
- -avoid-version \
- -shared \
- -shrext .so.2 \
- -Wl,--version-script=$(top_srcdir)/src/nss-systemd/nss-systemd.sym
-
-libnss_systemd_la_LIBADD = \
- libsystemd-internal.la \
- libbasic.la
-
-rootlib_LTLIBRARIES += \
- libnss_systemd.la
-
-# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/nss-myhostname.sym \
|
