Commit Diff

Commit:
0130fe58c1ded20e2c044839d6254081941a714a
From:
Christian Ludwig <chrissicool@gmail.com>
Via:
Thomas Adam <thomas.adam@smoothwall.net>
Date:
Message:
automake: Fix path to libexec directory The got_lib_privsep.h header expects the path to the libexec directory to be called GOT_LIBEXECDIR. At the moment it always falls back to using /usr/libexec. Fix what looks to be a typo.
Actions:
Patch | Tree
commit - acf52a76031e15e6a2bbe327bc4291a2867ae143
commit + 0130fe58c1ded20e2c044839d6254081941a714a
blob - 4d15c9e720e7a7644d6983ae2ff9c92677aa1ea7
blob + 8db86d06ba3802afc9a6d4ac16a4875baeb1ab77
--- Makefile.am
+++ Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = compat/*.[ch] \
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION'" \
 	-DGOT_VERSION_NUMBER='"@VERSION"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/include
blob - bd5690e64116b0d1179fc55295f22a1748a20c18
blob + a50e010273d86503455feace8d8a6c20b9deee7c
--- 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_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - a82ceae6ec0e1c190faf5bf202acf3c63aaed985
blob + 7909bcd4700144b4c9ad1c3b415c3d19f1c74a5d
--- got/Makefile.am
+++ got/Makefile.am
@@ -49,7 +49,7 @@ man1_MANS = got.1
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 6bec7341a250fce2618dd09f083bd3b44d3d589f
blob + 649877a6a123c30120cf6751d081f92f9c4046f4
--- libexec/got-fetch-pack/Makefile.am
+++ libexec/got-fetch-pack/Makefile.am
@@ -14,7 +14,7 @@ got_fetch_pack_DEPENDENCIES = $(top_builddir)/compat/l
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 21cc09d8b72e52bbb3671ba9d3b33efb9eb6d9df
blob + ea1b1c5e08e4dc34527b675fa2c1d16f29651305
--- libexec/got-index-pack/Makefile.am
+++ libexec/got-index-pack/Makefile.am
@@ -15,7 +15,7 @@ got_index_pack_DEPENDENCIES = $(top_builddir)/compat/l
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 71a30282ee76458c64cd376e289eac1988ddca39
blob + 993333968f226d50dbc80ce5e46bd0330019bb3d
--- libexec/got-read-blob/Makefile.am
+++ libexec/got-read-blob/Makefile.am
@@ -11,7 +11,7 @@ got_read_blob_DEPENDENCIES = $(top_builddir)/compat/li
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 0ab79163a4754972dc942087668756f1e00ebb0e
blob + f1f5756264aa3dbd78ba6664313c682f8587b7fa
--- libexec/got-read-commit/Makefile.am
+++ libexec/got-read-commit/Makefile.am
@@ -11,7 +11,7 @@ got_read_commit_DEPENDENCIES = $(top_builddir)/compat/
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 903df75ca3c43917dd99eddace902298fcb693ed
blob + 64b7b621af5015185af2dfde801bca0ae8ca0de2
--- libexec/got-read-gitconfig/Makefile.am
+++ libexec/got-read-gitconfig/Makefile.am
@@ -12,7 +12,7 @@ got_read_gitconfig_DEPENDENCIES = $(top_builddir)/comp
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 719564d719ca2122f6eac9b8c3ffef5ad8fddbb8
blob + cde37a279ebe74b06c71e274b61b1b0c39a3a517
--- libexec/got-read-gotconfig/Makefile.am
+++ libexec/got-read-gotconfig/Makefile.am
@@ -12,7 +12,7 @@ got_read_gotconfig_DEPENDENCIES = $(top_builddir)/comp
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 063d39691da2fdb2540c3a42fc2cd0ede7d60345
blob + 5c47a9f77d6d2e22fd8e735296ef9ae6697536fc
--- libexec/got-read-object/Makefile.am
+++ libexec/got-read-object/Makefile.am
@@ -11,7 +11,7 @@ got_read_object_DEPENDENCIES = $(top_builddir)/compat/
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - fe4f9d2dbb8eec3c662d4e74e633d41ed2b2b372
blob + 8205ace1b1d62316fe2aa75718f074864a7a073e
--- libexec/got-read-pack/Makefile.am
+++ libexec/got-read-pack/Makefile.am
@@ -17,7 +17,7 @@ got_read_pack_DEPENDENCIES = $(top_builddir)/compat/li
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 112d9d90900d86f0692470a7bb9f5cf2c534143c
blob + 2e99e3934e5b4eac7ad1c9f03461e156dba13740
--- libexec/got-read-tag/Makefile.am
+++ libexec/got-read-tag/Makefile.am
@@ -11,7 +11,7 @@ got_read_tag_DEPENDENCIES = $(top_builddir)/compat/lib
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 050827f6b6202583356080ee92f2d531fd3bf1a4
blob + 86f5f879fcd5554c70e232f687a57f28cf9ec45f
--- libexec/got-read-tree/Makefile.am
+++ libexec/got-read-tree/Makefile.am
@@ -11,7 +11,7 @@ got_read_tree_DEPENDENCIES = $(top_builddir)/compat/li
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \
blob - 22be8f445205b2b01aced81e6ed5000cb6e90ac4
blob + c2008c8509d9681fd7b84685e0f5027c14ec80db
--- tog/Makefile.am
+++ tog/Makefile.am
@@ -47,7 +47,7 @@ man1_MANS = tog.1
 
 AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
 	-DGOT_VERSION_NUMBER='"@VERSION@"' \
-	-DGOT_LIBEXEC_DIR="${bindir}" \
+	-DGOT_LIBEXECDIR="${bindir}" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/compat \
 	-I$(top_srcdir)/lib \