fix things

4 files changed, 16 insertions, 1 deletions

diff --git a/build-aux/Makefile.each.tail/60-amcfg.mk b/build-aux/Makefile.each.tail/60-amcfg.mk
index f86bdf4998..ae9d25457b 100644
--- a/build-aux/Makefile.each.tail/60-amcfg.mk
+++ b/build-aux/Makefile.each.tail/60-amcfg.mk
@@ -43,3 +43,10 @@ $(DESTDIR)$(zshcompletiondir)/_%: $(srcdir)/%.completion.zsh
 $(DESTDIR)$(zshcompletiondir)/_%: $(outdir)/%.completion.zsh
 	@$(NORMAL_INSTALL)
 	$(am.INSTALL)
+
+$(DESTDIR)$(xinitrcdir)/%.sh: $(srcdir)/%.xinitrc
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(xinitrcdir)/%.sh: $(outdir)/%.xinitrc
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
diff --git a/build-aux/Makefile.once.head/10-lt.mk b/build-aux/Makefile.once.head/10-lt.mk
index ea7323b647..9d27d62870 100644
--- a/build-aux/Makefile.once.head/10-lt.mk
+++ b/build-aux/Makefile.once.head/10-lt.mk
@@ -43,7 +43,7 @@ _lt.dedup = $(if $1,$(if $(filter $(firstword $1),$(call _lt.rest,$1)),,$(firstw
 # Insert a .la library's dependency_libs after the library itself in the list.
 _lt.dependency_libs = $(foreach _lt.tmp,$1,$(_lt.tmp)$(if $(filter %.la,$(_lt.tmp)), $(shell . $(_lt.tmp); echo $$dependency_libs)))
 
- lt.lib.rpath     = $(dir $(filter %/$(@F),$(files.sys)))
+ lt.lib.rpath     = $(patsubst %/,%,$(dir $(filter %/$(@F),$(files.sys))))
  lt.lib.files.all = $(filter %.lo %.la -l%,$(call _lt.unLIBPATTERNS,$^))
  lt.lib.files.ld  = $(strip $(if $(lt.lib.rpath),\
                                  $(lt.lib.files.all),\
diff --git a/build-aux/Makefile.once.head/20-amcfg.mk b/build-aux/Makefile.once.head/20-amcfg.mk
index 0a16c148a2..e5a674116c 100644
--- a/build-aux/Makefile.once.head/20-amcfg.mk
+++ b/build-aux/Makefile.once.head/20-amcfg.mk
@@ -31,6 +31,10 @@ am.sys2out_DATA = \
         $(patsubst $(bashcompletiondir)/%,%.completion.bash,\
         $(patsubst $(zshcompletiondir)/_%,%.completion.zsh,\
         $1)))))))
+am.sys2out_SCRIPTS = \
+        $(notdir \
+        $(patsubst $(xinitrcdir)/%.sh,%.xinitrc,\
+        $1))
 am.sys2out_HEADERS = $(abspath $(addprefix $(srcdir)/include/,$(notdir $1)))
 
 V ?=
diff --git a/build-aux/Makefile.once.head/30-am.mk b/build-aux/Makefile.once.head/30-am.mk
index 5427e8004d..3be5e011f8 100644
--- a/build-aux/Makefile.once.head/30-am.mk
+++ b/build-aux/Makefile.once.head/30-am.mk
@@ -177,6 +177,7 @@ define _am.pass2.doc
 #   - Directory variable : `am.subdirs`
 #
 # TODO: I'm not in love with how it figures out `am.subdirs`.
+# TODO: I'm not in love with how it does the `install` dependencies.
 endef
 _am.pass2 = $(eval $(foreach f,$(am.out_PROGRAMS)   ,$(call _am.per_PROGRAM,$f,$(call _am.file2var,$f))$(at.nl)))
 _am.var_PROGRAMS    = $1_SOURCES nodist_$1_SOURCES $1_CFLAGS $1_CPPFLAGS $1_LDFLAGS $1_LDADD
@@ -189,6 +190,7 @@ am.CPPFLAGS +=                 $$($2_CPPFLAGS)          $$(call _am.file2cpp,$1,
 am.CFLAGS   +=                 $$($2_CFLAGS)
 $$(outdir)/$1: private am.LDFLAGS := $$($2_LDFLAGS)
 $$(outdir)/$1: $$(_am.depends)
+$$(outdir)/install: $$(addsuffix install,$$(dir $$(filter %.la,$$(_am.depends))))
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
                                     $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends))))))
@@ -216,6 +218,7 @@ define _am.pass3.doc
 #   - Directory variable : `am.subdirs`
 #
 # TODO: I'm not in love with how it figures out `am.subdirs`.
+# TODO: I'm not in love with how it does the `install` dependencies.
 endef
 _am.pass3 = $(eval $(foreach f,$(am.out_LTLIBRARIES),$(call _am.per_LTLIBRARY,$f,$(call _am.file2var,$f))$(at.nl)))
 _am.var_LTLIBRARIES = $1_SOURCES nodist_$1_SOURCES $1_CFLAGS $1_CPPFLAGS $1_LDFLAGS $1_LIBADD
@@ -228,6 +231,7 @@ am.CPPFLAGS +=                 $$($2_CPPFLAGS)          $$(call _am.file2cpp,$1,
 am.CFLAGS   +=                 $$($2_CFLAGS)
 $$(outdir)/$1: private am.LDFLAGS := $$($2_LDFLAGS)
 $$(outdir)/$1: $$(_am.depends)
+$$(outdir)/install: $$(addsuffix install,$$(dir $$(filter %.la,$$(_am.depends))))
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
                                     $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends))))))