From 7b5516edb2acfc4ef6a48c5044eb4263eb9a3ad3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 1 Jun 2016 18:48:01 -0400
Subject: stuff

---
 build-aux/Makefile.each.tail/20-systemd.mk |  3 +++
 build-aux/Makefile.once.head/20-systemd.mk | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'build-aux')

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index fa0bd9ec2a..48963c2a22 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -13,3 +13,6 @@ $(outdir)/.deps:
 
 $(outdir)/%.la:
 	$(AM_V_CCLD)$(LINK) $(filter-out .var%,$^)
+
+$(DESTDIR)$(libdir)/%.so: $(outdir)/%.la
+	$(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $< $(@D)
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index 7358649809..2a2f3a7ac5 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -34,6 +34,11 @@ COMPILE   = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=compile $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
 LINK      = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=link $(CCLD) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@
 
+SED_PROCESS = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
+		< $< > $@
+
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
@@ -126,7 +131,7 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-at.dirlocal += noinst_LTLIBRARIES
+at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES
 automake_name = $(subst -,_,$(subst .,_,$1))
 automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
 automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources)))
@@ -134,7 +139,9 @@ automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources)))
 automake_libs = $($(automake_name)_LIBADD)
 
 define automake2autothing
-std.out_files += $(noinst_LTLIBRARIES)
+std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) $(notdir $(pkgconfiglib_DATA))
+std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES))
+std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA)))
 $(foreach n,$(call automake_name,$(std.out_files)),\
   $(eval $n_SOURCES ?=)\
   $(eval nodist_$n_SOURCES ?=)\
-- 
cgit v1.2.3-54-g00ecf