summaryrefslogtreecommitdiff
path: root/package/systemd/patches/patch-Makefile_am
blob: fd2cddfb2d8d62d7f42b369e35bc2b1da984b63f (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-233.orig/Makefile.am	2017-03-01 22:43:06.000000000 +0100
+++ systemd-233/Makefile.am	2017-06-07 22:02:15.904940794 +0200
@@ -320,9 +320,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 \
@@ -333,15 +333,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)
 
@@ -5183,39 +5174,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 \