patch-Makefile_am 1.9 KB

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