get `make install` mostly working

5 files changed, 36 insertions, 3 deletions

diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index dc322e642a..1a65c000e2 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -56,16 +56,25 @@ _systemd.in_destdir = $(foreach f,$(std.sys_files),$(if $(filter $1,$(patsubst %
 
 define install_bindir
 $(call _systemd.in_destdir,$(bindir)): $(DESTDIR)$(bindir)/%: $(outdir)/%
-	$(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+	@$(NORMAL_INSTALL)
+	$(AM_V_PROG)$(LIBTOOL) $(AM_V_lt) --tag=CC $(SYS_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
 endef
 $(foreach bindir,$(sort $(foreach d,$(am.bindirs),$($ddir))),$(eval $(value install_bindir)))
 
 define install_libdir
 $(call _systemd.in_destdir,$(libdir)): $(DESTDIR)$(libdir)/%.la: $(outdir)/%.la
-	$(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $< $@
+	@$(NORMAL_INSTALL)
+	$(AM_V_LIB)$(LIBTOOL) $(AM_V_lt) --tag=CC $(SYS_LIBTOOLFLAGS) --mode=install $(INSTALL) $< $@
 endef
 $(foreach libdir,$(sort $(foreach d,lib rootlib,$($ddir))),$(eval $(value install_libdir)))
 
+define install_datadir
+$(call _systemd.in_destdir,$(datadir)): $(DESTDIR)$(datadir)/%: $(outdir)/%
+	@$(NORMAL_INSTALL)
+	$(AM_V_DATA)$(INSTALL_DATA) $< $@
+endef
+$(foreach datadir,$(sort $(foreach d,pkgconfigdata pkgconfiglib bootlib,$($ddir))),$(eval $(value install_datadir)))
+
 $(outdir)/%-from-name.gperf: $(outdir)/%-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index 8745e8bb18..04627a9497 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -38,6 +38,11 @@ ALL_CPPFLAGS     = $(OUR_CPPFLAGS)     $(am.CPPFLAGS/$(@D))     $(systemd.CPPFLA
 ALL_LDFLAGS      = $(OUR_LDFLAGS)      $(am.LDFLAGS/$(@D))      $(systemd.LDFLAGS/$(@D))      $(LDFLAGS)
 ALL_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(am.LIBTOOLFLAGS/$(@D)) $(systemd.LIBTOOLFLAGS/$(@D)) $(LIBTOOLFLAGS)
 
+SYS_CFLAGS       = $(OUR_CFLAGS)       $(am.CFLAGS/$(<D))       $(systemd.CFLAGS/$(<D))       $(CFLAGS)
+SYS_CPPFLAGS     = $(OUR_CPPFLAGS)     $(am.CPPFLAGS/$(<D))     $(systemd.CPPFLAGS/$(<D))     $(CPPFLAGS)
+SYS_LDFLAGS      = $(OUR_LDFLAGS)      $(am.LDFLAGS/$(<D))      $(systemd.LDFLAGS/$(<D))      $(LDFLAGS)
+SYS_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(am.LIBTOOLFLAGS/$(<D)) $(systemd.LIBTOOLFLAGS/$(<D)) $(LIBTOOLFLAGS)
+
 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 $@
@@ -102,6 +107,21 @@ AM_V_GEN_ = $(AM_V_GEN_$(AM_DEFAULT_VERBOSITY))
 AM_V_GEN_0 = @echo "  GEN     " $@;
 AM_V_GEN_1 =
 
+AM_V_DATA = $(AM_V_DATA_$(V))
+AM_V_DATA_ = $(AM_V_DATA_$(AM_DEFAULT_VERBOSITY))
+AM_V_DATA_0 = @echo "  DATA    " $@;
+AM_V_DATA_1 =
+
+AM_V_PROG = $(AM_V_PROG_$(V))
+AM_V_PROG_ = $(AM_V_PROG_$(AM_DEFAULT_VERBOSITY))
+AM_V_PROG_0 = @echo "  PROG    " $@;
+AM_V_PROG_1 =
+
+AM_V_LIB = $(AM_V_LIB_$(V))
+AM_V_LIB_ = $(AM_V_LIB_$(AM_DEFAULT_VERBOSITY))
+AM_V_LIB_0 = @echo "  LIB     " $@;
+AM_V_LIB_1 =
+
 AM_V_at = $(AM_V_at_$(V))
 AM_V_at_ = $(AM_V_at_$(AM_DEFAULT_VERBOSITY))
 AM_V_at_0 = @
diff --git a/config.mk.in b/config.mk.in
index caf72a2918..135cd4f758 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -98,7 +98,7 @@ bootlibdir = $(prefix)/lib/systemd/boot/efi
 rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
-rootlibdir=$(rootprefix)/lib
+rootlibdir=@rootlibdir@
 
 # Libraries we provide
 libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic
@@ -289,6 +289,8 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 
+INSTALL = install -D
+
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
diff --git a/configure.ac b/configure.ac
index 86bb2f10cb..f08d1e991e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1665,6 +1665,7 @@ AC_MSG_RESULT([
         tests:                             ${enable_tests}
 
         prefix:                            ${prefix}
+        exec_prefix:                       ${exec_prefix}
         rootprefix:                        ${with_rootprefix}
         sysconf dir:                       ${sysconfdir}
         datarootdir:                       ${datarootdir}
diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk
index 30b6593b42..752ffa6aed 100644
--- a/src/libsystemd/libsystemd-internal/subdir.mk
+++ b/src/libsystemd/libsystemd-internal/subdir.mk
@@ -29,5 +29,6 @@ systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
 systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+systemd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk