diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:15:50 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 17:15:50 -0400 |
| commit | 463d0a07a7708927ba4239545e2c85a2a7aaeff6 (patch) | |
| tree | 420fdd9d3581bf44cf86481d44a308517b80241d /build-aux | |
| parent | 6726400e1ebc7fedb147e41c2f12410fe848aeb1 (diff) | |
get `make install` mostly working
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Makefile.each.tail/20-systemd.mk | 13 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 20 |
2 files changed, 31 insertions, 2 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 = @ |