git: apply config.prefix to paths

see #15: Support configurable PREFIX
oasislinux · Oct 4, 2023 · 9d1c006 · 9d1c006
1 parent 4443276
commit 9d1c006
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/pkg/git/config.h b/pkg/git/config.h
@@ -1,15 +1,9 @@
 #define DEFAULT_EDITOR "ed"
-#define DEFAULT_GIT_TEMPLATE_DIR "share/git-core/templates"
 #define DEFAULT_PAGER ""
 #define ETC_GITATTRIBUTES "/etc/gitattributes"
 #define ETC_GITCONFIG "/etc/gitconfig"
 #define GIT_BUILT_FROM_COMMIT "43c8a30d150ecede9709c1f2527c8fba92c65f40"
-#define GIT_EXEC_PATH "libexec/git-core"
 #define GIT_HOST_CPU "unknown"
-#define GIT_HTML_PATH "share/doc/git-doc"
-#define GIT_INFO_PATH "share/info"
-#define GIT_LOCALE_PATH "/share/locale"
-#define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
 #define GIT_VERSION "2.42.0"
 #define HAVE_ALLOCA_H

diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
@@ -31,6 +31,14 @@ build('hooklist', '$outdir/hook-list.h', {
 	'|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.txt'
 })
 
+cc('setup.c', nil, {cflags=string.format(
+	[[$cflags '-D DEFAULT_GIT_TEMPLATE_DIR="%s/share/git-core/templates"']],
+	config.prefix)
+})
+cc('exec-cmd.c', nil, {cflags=string.format(
+	[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""' '-D GIT_EXEC_PATH="%s/libexec/git-core"']],
+	config.prefix)
+})
 cc('exec-cmd.c', nil, {cflags=[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""']]})
 cc('common-main.c')
 cc('http.c')
@@ -219,7 +227,7 @@ lib('libgit.a', [[
 	sequencer.c
 	serve.c
 	server-info.c
-	setup.c
+	setup.c.o
 	shallow.c
 	sideband.c
 	sigchain.c
@@ -361,7 +369,6 @@ local builtins = {
 	'get-tar-commit-id',
 	'grep',
 	'hash-object',
-	'help',
 	'hook',
 	'index-pack',
 	'init-db',
@@ -434,7 +441,15 @@ local builtins = {
 	'worktree',
 	'write-tree',
 }
-exe('git', {'git.c', 'common-main.c.o', expand{'builtin/', builtins, '.c'}, 'libgit.a.d'})
+
+local docdefs = string.format([['-D GIT_INFO_PATH="%s/share/info"' ]]
+	.. [['-D GIT_MAN_PATH="%s/share/man"' ]]
+	.. [['-D GIT_HTML_PATH="%s/share/doc/git-doc"']],
+	config.prefix, config.prefix, config.prefix)
+
+cc('git.c', nil, {cflags=[[$cflags ]] .. docdefs})
+cc('builtin/help.c', nil, {cflags=[[$cflags ]] .. docdefs})
+exe('git', {'git.c.o', 'common-main.c.o', 'builtin/help.c.o', expand{'builtin/', builtins, '.c'}, 'libgit.a.d'})
 file('bin/git', '755', '$outdir/git')
 
 local programs = {