From a12083999ac50e41e985996a3e25594d5dcd5f77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Feb 2017 13:55:54 -0400 Subject: Added git template directory to Linux standalone tarball and OSX app bundle. Git does not provide a switch to find out where this directory is, and while the git-init man page says it will always be in /usr/share/git-core/templates, that's not the case on OSX with git installed from homebrew. So, I used a hack taking the --man-path and constructing a path from that. Works on both Debian and OSX at least. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b9fabb51..cc254c438 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,7 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs install -d "$(LINUXSTANDALONE_DEST)/git-core" (cd "$(shell git --exec-path)" && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/git-core && tar x) install -d "$(LINUXSTANDALONE_DEST)/templates" + (cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(LINUXSTANDALONE_DEST)"/templates && tar x) install -d "$(LINUXSTANDALONE_DEST)/magic" cp /usr/share/file/magic.mgc "$(LINUXSTANDALONE_DEST)/magic" cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)" @@ -205,6 +206,7 @@ osxapp: Build/Standalone Build/OSXMkLibs (cd "$(shell git --exec-path)" && tar c .) | (cd "$(OSXAPP_BASE)" && tar x) install -d "$(OSXAPP_BASE)/templates" + (cd "$(shell git --man-path)"/../git-core/templates && tar c .) | (cd "$(OSXAPP_BASE)"/templates && tar x) install -d "$(OSXAPP_BASE)/magic" if [ -e "$(OSX_MAGIC_FILE)" ]; then \ cp "$(OSX_MAGIC_FILE)" "$(OSXAPP_BASE)/magic/magic.mgc"; \ -- cgit v1.2.3