X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile;h=76f36cd3608b290707a7ad4c4e20d93951a6724c;hb=c65a9470fbaa57b9b815addde51ad22648f6d353;hp=2e8ed5af17acb18821410f94c244f9881abf957b;hpb=a682ef9f06075b4bb83dcf479c91d578125084b9;p=git.git diff --git a/Makefile b/Makefile index 2e8ed5af1..76f36cd36 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-update-server-info git-show-rev-cache git-build-rev-cache ifndef NO_CURL -PROG+= git-http-pull + PROG+= git-http-pull endif LIB_FILE=libgit.a @@ -130,20 +130,20 @@ else OPENSSL_LIBSSL= endif ifdef MOZILLA_SHA1 - SHA1_HEADER="mozilla-sha1/sha1.h" - LIB_OBJS += mozilla-sha1/sha1.o + SHA1_HEADER="mozilla-sha1/sha1.h" + LIB_OBJS += mozilla-sha1/sha1.o else -ifdef PPC_SHA1 - SHA1_HEADER="ppc/sha1.h" - LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o -else - SHA1_HEADER= -ifeq ($(shell uname -s),Darwin) - LIBS += -lcrypto -lssl -else - LIBS += -lcrypto -endif -endif + ifdef PPC_SHA1 + SHA1_HEADER="ppc/sha1.h" + LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o + else + SHA1_HEADER= + ifeq ($(shell uname -s),Darwin) + LIBS += -lcrypto -lssl + else + LIBS += -lcrypto + endif + endif endif DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)' @@ -212,8 +212,6 @@ install: $(PROG) $(SCRIPTS) $(INSTALL) -m755 -d $(DESTDIR)$(bindir) $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir) $(MAKE) -C templates install - -install-tools: $(MAKE) -C tools install install-doc: