Revert "Convert git-annotate to use Git.pm"

diff --git a/Makefile b/Makefile
index ac42ae32bad42536da717810c77fa38901028e63..4e7a37aa3c27225a86b16566fb96dc94362cd0d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,7 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
 CFLAGS = -g -O2 -Wall
+PIC_FLAG = -fPIC
 LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
@@ -402,6 +403,9 @@ endif
 ifneq (,$(findstring arm,$(uname_M)))
        ARM_SHA1 = YesPlease
 endif
+ifeq ($(uname_M),sun4u)
+       USE_PIC = YesPlease
+endif
 ifeq ($(uname_M),x86_64)
        USE_PIC = YesPlease
 endif
@@ -544,7 +548,7 @@ endif
 endif
 endif
 ifdef USE_PIC
-       ALL_CFLAGS += -fPIC
+       ALL_CFLAGS += $(PIC_FLAG)
 endif
 ifdef NO_ACCURATE_DIFF
        BASIC_CFLAGS += -DNO_ACCURATE_DIFF