Use system-openssl in Makefile. Use /usr/bin/wish in gitk. Fix perl install locations. diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -499,6 +499,9 @@ ifeq ($(uname_S),Darwin) endif endif +BASIC_CFLAGS += -I%p/lib/system-openssl/include -I%p/include +BASIC_LDFLAGS += -L%p/lib/system-openssl/lib -L%p/lib + ifdef NO_R_TO_GCC_LINKER # Some gcc does not accept and pass -R to the linker to specify # the runtime dynamic library path. diff --git a/gitk b/gitk --- a/gitk +++ b/gitk @@ -1,6 +1,6 @@ #!/bin/sh # Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "$@" +exec /usr/bin/wish "$0" -- "$@" # Copyright (C) 2005-2006 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified diff --git a/perl/Makefile b/perl/Makefile --- a/perl/Makefile +++ b/perl/Makefile @@ -33,7 +33,7 @@ instdir_SQ = $(subst ','\'',$(prefix)/li echo ' echo $(instdir_SQ)' >> $@ else $(makfile): Makefile.PL ../GIT-CFLAGS - $(PERL_PATH) $< PREFIX='$(prefix_SQ)' + $(PERL_PATH) $< PREFIX='$(prefix_SQ)' LIB='%p/lib/perl5' INSTALLSITEMAN3DIR='%p/share/man/man3' endif # this is just added comfort for calling make directly in perl dir