commit 6b78ad28aa9fd55e0c2ae44dea662944bbc279d7 from: Thomas Adam date: Sat Sep 25 22:25:13 2021 UTC libexec: honour libeexec path for helpers libexec is a common path which is understood by autotools, and should be honoured. Patch from Christian "naddy" Weisgerber commit - 326237a6c2a5c369201269e581d6eccd38376efc commit + 6b78ad28aa9fd55e0c2ae44dea662944bbc279d7 blob - bf30f9a6789e3c1b8b381c121979a4476569135e blob + ae25dd0b8c480bbd035f0bec9258dad705303e35 --- Makefile.am +++ Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = CHANGES CHANGELOG AM_CPPFLAGS += -DGOT_VERSION='"@VERSION'" \ -DGOT_VERSION_NUMBER='"@VERSION"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/include blob - 77a4b663e28d1206c2b7ed331a3fef25b9a5e44d blob + 49f23799a8f498120c8f4e78513e02cfb55f0417 --- compat/Makefile.am +++ compat/Makefile.am @@ -2,7 +2,7 @@ noinst_LIBRARIES = libopenbsd-compat.a AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 5ebe78c6f3672b7046aad9c58c524fe8813b9de0 blob + 5ebca066f379fb262f13f31703af74482e68c58b --- got/Makefile.am +++ got/Makefile.am @@ -55,7 +55,7 @@ man5_MANS = got.conf.5 git-repository.5 got-worktree.5 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 00a672f3581ffa440c383d285a0221d1b337c6f9 blob + e9e5b7e5ac103313820888408bb518f241896efb --- gotadmin/Makefile.am +++ gotadmin/Makefile.am @@ -32,7 +32,7 @@ EXTRA_DIST = gotadmin.1 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 25485b0cbb26cde38501d4f61c0b23715d78ea9d blob + 6f7ce0f513e24d00d5139cc4bc89bd07ad2038be --- libexec/got-fetch-pack/Makefile.am +++ libexec/got-fetch-pack/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-fetch-pack +libexec_PROGRAMS = got-fetch-pack got_fetch_pack_SOURCES = \ got-fetch-pack.c \ $(top_srcdir)/lib/error.c \ @@ -14,7 +14,7 @@ got_fetch_pack_DEPENDENCIES = $(top_builddir)/compat/l AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 6b20deb93e0e6937c17444e2f1ec563946e69d8e blob + ca029d269ab98c3b9df9a4879cd3e6d884a81b29 --- libexec/got-index-pack/Makefile.am +++ libexec/got-index-pack/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-index-pack +libexec_PROGRAMS = got-index-pack got_index_pack_SOURCES = got-index-pack.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -15,7 +15,7 @@ got_index_pack_DEPENDENCIES = $(top_builddir)/compat/l AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 849842417d2a67c5e3618fbd1d71c0d04c20faa3 blob + 9787e4287b6c2b403820e9d2265d2179e217e6bb --- libexec/got-read-blob/Makefile.am +++ libexec/got-read-blob/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-blob +libexec_PROGRAMS = got-read-blob got_read_blob_SOURCES = got-read-blob.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -11,7 +11,7 @@ got_read_blob_DEPENDENCIES = $(top_builddir)/compat/li AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 99d20ab33888f19cfec22d0602b3ab39a37dbb57 blob + 3586ea049605e4d04cfea21e0ca4aa20ef7924ba --- libexec/got-read-commit/Makefile.am +++ libexec/got-read-commit/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-commit +libexec_PROGRAMS = got-read-commit got_read_commit_SOURCES = got-read-commit.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -11,7 +11,7 @@ got_read_commit_DEPENDENCIES = $(top_builddir)/compat/ AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 54fa239e44980145bf0350fc9ebad50ce68c5c42 blob + 5699d7034d03c8eb443a6820c6325923357d6168 --- libexec/got-read-gitconfig/Makefile.am +++ libexec/got-read-gitconfig/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-gitconfig +libexec_PROGRAMS = got-read-gitconfig got_read_gitconfig_SOURCES = got-read-gitconfig.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -12,7 +12,7 @@ got_read_gitconfig_DEPENDENCIES = $(top_builddir)/comp AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 429a7857ecb688b5163f9e16cbfdd4bacab32e6f blob + 264f7aad9a614cb59909dddf2f06a020e85cf28d --- libexec/got-read-gotconfig/Makefile.am +++ libexec/got-read-gotconfig/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-gotconfig +libexec_PROGRAMS = got-read-gotconfig got_read_gotconfig_SOURCES = \ got-read-gotconfig.c \ gotconfig.h \ @@ -14,7 +14,7 @@ got_read_gotconfig_DEPENDENCIES = $(top_builddir)/comp AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 3ce3eec95827db17f651b41c24dec627e19a1cfd blob + 089f1d5923f32b25698bbb3d9e1df4cb6cbaf4df --- libexec/got-read-object/Makefile.am +++ libexec/got-read-object/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-object +libexec_PROGRAMS = got-read-object got_read_object_SOURCES = got-read-object.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -11,7 +11,7 @@ got_read_object_DEPENDENCIES = $(top_builddir)/compat/ AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 2a0a70e217dfdb8232c7823b197c9dfd15a96d3b blob + c11d0fae56e2e3b3c07e1b798641d9a4c17ec2f9 --- libexec/got-read-pack/Makefile.am +++ libexec/got-read-pack/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-pack +libexec_PROGRAMS = got-read-pack got_read_pack_SOURCES = got-read-pack.c \ $(top_srcdir)/lib/delta.c \ $(top_srcdir)/lib/delta_cache.c \ @@ -17,7 +17,7 @@ got_read_pack_DEPENDENCIES = $(top_builddir)/compat/li AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - 606ce8304c922730b4de471b4784a19cc3b69da2 blob + 58829dc6b5691553e2ba41c554b68bba14ad6985 --- libexec/got-read-tag/Makefile.am +++ libexec/got-read-tag/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-tag +libexec_PROGRAMS = got-read-tag got_read_tag_SOURCES = got-read-tag.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -11,7 +11,7 @@ got_read_tag_DEPENDENCIES = $(top_builddir)/compat/lib AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - ed03e85174527f0b6dc6ad2bba5e7921c7cf0dc6 blob + 63e7bf8526ff4755fb7ececc2c0b141d9c3acac0 --- libexec/got-read-tree/Makefile.am +++ libexec/got-read-tree/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-read-tree +libexec_PROGRAMS = got-read-tree got_read_tree_SOURCES = got-read-tree.c \ $(top_srcdir)/lib/error.c \ $(top_srcdir)/lib/inflate.c \ @@ -11,7 +11,7 @@ got_read_tree_DEPENDENCIES = $(top_builddir)/compat/li AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - d6178b1ec93457ae8bf70fe9c85b90186d9471c2 blob + 496757723bf7f3852ad7b6645a1524b9f0fb6663 --- libexec/got-send-pack/Makefile.am +++ libexec/got-send-pack/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = got-send-pack +libexec_PROGRAMS = got-send-pack got_send_pack_SOURCES = \ got-send-pack.c \ $(top_srcdir)/lib/error.c \ @@ -14,7 +14,7 @@ got_send_pack_DEPENDENCIES = $(top_builddir)/compat/li AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \ blob - da1c40a1cf3887d098de63cce0f5417b159042d6 blob + 45ba80e940a88b7dc707882566aea5cc20312cb6 --- tog/Makefile.am +++ tog/Makefile.am @@ -49,7 +49,7 @@ EXTRA_DIST = tog.1 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \ -DGOT_VERSION_NUMBER='"@VERSION@"' \ - -DGOT_LIBEXECDIR="${bindir}" \ + -DGOT_LIBEXECDIR="$(libexecdir)" \ -I$(top_srcdir) \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/lib \