From fb1a64c4cfc1417609a465f739af7bc5ef827bb6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 3 Mar 2016 19:41:29 -0500 Subject: buildsystem: rename all of the install-* variables to libretools-* --- src/chroot-tools/Makefile | 10 +++++----- src/devtools/Makefile | 6 +++--- src/lib/Makefile | 2 +- src/librefetch/Makefile | 10 +++++----- src/xbs-abs/Makefile | 4 ++-- src/xbs-abslibre/Makefile | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/chroot-tools/Makefile b/src/chroot-tools/Makefile index a11e69c..48a1631 100644 --- a/src/chroot-tools/Makefile +++ b/src/chroot-tools/Makefile @@ -2,11 +2,11 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk pkglibexecdir = $(libexecdir)/libretools/chroot -install-bins = chcleanup librechroot libremakepkg -install-libexecs += arch-nspawn chcleanup distcc-tool indent mkarchroot -install-libs += makechrootpkg.sh -devtools-files = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in -am_clean_files += chcleanup.lib +libretools-bins = chcleanup librechroot libremakepkg +libretools-libexecs += arch-nspawn chcleanup distcc-tool indent mkarchroot +libretools-libs += makechrootpkg.sh +devtools-files = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in +am_clean_files += chcleanup.lib $(srcdir)/makechrootpkg.sh.in: $(srcdir)/%.sh.in: $(devtoolsdir)/%.in cp $< $@ diff --git a/src/devtools/Makefile b/src/devtools/Makefile index 7ccbbcc..72907f0 100644 --- a/src/devtools/Makefile +++ b/src/devtools/Makefile @@ -1,9 +1,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-bins += checkpkg find-libdeps finddeps lddd -devtools-files = $(addsuffix .in,$(install-bins)) -am_sys_files += $(bindir)/find-libprovides +libretools-bins += checkpkg find-libdeps finddeps lddd +devtools-files = $(addsuffix .in,$(libretools-bins)) +am_sys_files += $(bindir)/find-libprovides $(DESTDIR)$(bindir)/find-libprovides: install -d $(@D) diff --git a/src/lib/Makefile b/src/lib/Makefile index ec5a438..9e9b4a8 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -1,7 +1,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-libs += common.sh conf.sh +libretools-libs += common.sh conf.sh devtools-files = common.sh.in # Build ############################################################## diff --git a/src/librefetch/Makefile b/src/librefetch/Makefile index b28e96e..26ee2ee 100644 --- a/src/librefetch/Makefile +++ b/src/librefetch/Makefile @@ -1,11 +1,11 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -install-bins = librefetch librefetch-install -install-confs += librefetch-makepkg.conf -install-libexecs += $(filter librefetchdir/%,$(detect-exec)) -install-libs += $(filter-out $(install-libexecs),$(filter librefetchdir/%,$(detect-all))) -pots = $(install-bins) +libretools-bins = librefetch librefetch-install +libretools-confs += librefetch-makepkg.conf +libretools-libexecs += $(filter librefetchdir/%,$(detect-exec)) +libretools-libs += $(filter-out $(libretools-libexecs),$(filter librefetchdir/%,$(detect-all))) +pots = $(libretools-bins) $(outdir)/librefetch-install: $(var)pkgconfdir $(outdir)/librefetch-makepkg.conf: $(var)bindir diff --git a/src/xbs-abs/Makefile b/src/xbs-abs/Makefile index 81e1b4f..248848f 100644 --- a/src/xbs-abs/Makefile +++ b/src/xbs-abs/Makefile @@ -4,8 +4,8 @@ pkgconfdir = $(sysconfdir)/xbs pkglibexecdir = $(libexecdir)/xbs _helpers = archrelease commitpkg -install-bins = -install-libexecs = helper-abs +libretools-bins = +libretools-libexecs = helper-abs pots += $(_helpers) devtools-files += $(addsuffix .in,$(_helpers)) am_out_files += $(_helpers) diff --git a/src/xbs-abslibre/Makefile b/src/xbs-abslibre/Makefile index 6c61803..c946d5d 100644 --- a/src/xbs-abslibre/Makefile +++ b/src/xbs-abslibre/Makefile @@ -2,7 +2,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk pkglibexecdir = $(libexecdir)/xbs -install-bins = -install-libexecs = helper-abslibre +libretools-bins = +libretools-libexecs = helper-abslibre include $(topsrcdir)/automake.tail.mk -- cgit v1.2.3