Hi,
Jeffrey Walton wrote:
> I'm attempting to install Git 2.21.0 on Solaris 11.3 x86_64.
> /usr/gnu/bin is on-path.
[...]
> gmake -C gitweb install
> gmake[1]: Entering directory `/export/home/build/git-2.21.0/gitw
> eb'
> gmake[2]: Entering directory `/export/home/build/git-2.21.0'
> gmake[2]: `GIT-VERSION-FILE' is up to date.
> gmake[2]: Leaving directory `/export/home/build/git-2.21.0'
> GEN gitweb.cgi
> GEN static/gitweb.js
> install -d -m 755 '/usr/local/share/gitweb'
> directory /usr/local/share/gitweb created
> install -m 755 gitweb.cgi '/usr/local/share/gitweb'
> find: cycle detected for /lib/secure/32/
[...]
> install: gitweb.cgi was not found anywhere!
Sounds like it's using "install" when it should be using "ginstall".
config.mak.uname contains, under the SunOS category:
INSTALL = /usr/ucb/install
But gitweb/Makefile seems to forget to include ../config.mak.uname.
How about this patch?
-- >8 --
Subject: gitweb: use system-appropriate defaults for commands
Attempting to install gitweb on Solaris 11 produces
$ gmake install
...
gmake -C gitweb install
gmake[1]: Entering directory `/export/home/build/git-2.21.0/gitweb'
gmake[2]: Entering directory `/export/home/build/git-2.21.0'
gmake[2]: `GIT-VERSION-FILE' is up to date.
gmake[2]: Leaving directory `/export/home/build/git-2.21.0'
GEN gitweb.cgi
GEN static/gitweb.js
install -d -m 755 '/usr/local/share/gitweb'
directory /usr/local/share/gitweb created
install -m 755 gitweb.cgi '/usr/local/share/gitweb'
find: cycle detected for /lib/secure/32/
find: cycle detected for /lib/32/
find: cycle detected for /lib/crypto/32/
...
find: cycle detected for /usr/lib/gss/32/
install: gitweb.cgi was not found anywhere!
gmake[1]: *** [install] Error 2
gmake[1]: Leaving directory `/export/home/build/git-2.21.0/gitweb'
This is because the default "install" tool on SunOS doesn't follow the
convention we require. Use the /usr/ucb/install command specified in
config.mak.uname instead to fix it.
This should also help on other platforms where the default "install"
command is not functional enough.
Reported-by: Jeffrey Walton <[email protected]>
Signed-off-by: Jonathan Nieder <[email protected]>
---
Completely untested. Junio, please don't apply this without Jeffrey's
tested-by.
Thanks,
Jonathan
gitweb/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitweb/Makefile b/gitweb/Makefile
index cd194d057f..333aa58be0 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -39,7 +39,7 @@ GITWEB_SITE_HEADER =
GITWEB_SITE_FOOTER =
HIGHLIGHT_BIN = highlight
-# include user config
+include ../config.mak.uname
-include ../config.mak.autogen
-include ../config.mak
-include config.mak
--
2.21.0.1020.gf2820cf01a
