| 1 | diff --recursive --unified ../git-1.4.0.orig/Documentation/Makefile ./Documentation/Makefile |
|---|
| 2 | --- ../git-1.4.0.orig/Documentation/Makefile 2006-06-10 15:41:54.000000000 -0400 |
|---|
| 3 | +++ ./Documentation/Makefile 2006-06-29 22:48:15.000000000 -0400 |
|---|
| 4 | @@ -26,7 +26,7 @@ |
|---|
| 5 | |
|---|
| 6 | prefix?=$(HOME) |
|---|
| 7 | bin=$(prefix)/bin |
|---|
| 8 | -mandir=$(prefix)/man |
|---|
| 9 | +mandir=$(prefix)/share/man |
|---|
| 10 | man1=$(mandir)/man1 |
|---|
| 11 | man7=$(mandir)/man7 |
|---|
| 12 | # DESTDIR= |
|---|
| 13 | diff --recursive --unified ../git-1.4.0.orig/Makefile ./Makefile |
|---|
| 14 | --- ../git-1.4.0.orig/Makefile 2006-06-10 15:41:54.000000000 -0400 |
|---|
| 15 | +++ ./Makefile 2006-06-29 22:50:34.000000000 -0400 |
|---|
| 16 | @@ -85,8 +85,6 @@ |
|---|
| 17 | |
|---|
| 18 | # CFLAGS and LDFLAGS are for the users to override from the command line. |
|---|
| 19 | |
|---|
| 20 | -CFLAGS = -g -O2 -Wall |
|---|
| 21 | -LDFLAGS = |
|---|
| 22 | ALL_CFLAGS = $(CFLAGS) |
|---|
| 23 | ALL_LDFLAGS = $(LDFLAGS) |
|---|
| 24 | STRIP ?= strip |
|---|
| 25 | @@ -243,16 +241,6 @@ |
|---|
| 26 | ifeq ($(uname_S),Darwin) |
|---|
| 27 | NEEDS_SSL_WITH_CRYPTO = YesPlease |
|---|
| 28 | NEEDS_LIBICONV = YesPlease |
|---|
| 29 | - ## fink |
|---|
| 30 | - ifeq ($(shell test -d /sw/lib && echo y),y) |
|---|
| 31 | - ALL_CFLAGS += -I/sw/include |
|---|
| 32 | - ALL_LDFLAGS += -L/sw/lib |
|---|
| 33 | - endif |
|---|
| 34 | - ## darwinports |
|---|
| 35 | - ifeq ($(shell test -d /opt/local/lib && echo y),y) |
|---|
| 36 | - ALL_CFLAGS += -I/opt/local/include |
|---|
| 37 | - ALL_LDFLAGS += -L/opt/local/lib |
|---|
| 38 | - endif |
|---|
| 39 | endif |
|---|
| 40 | ifeq ($(uname_S),SunOS) |
|---|
| 41 | NEEDS_SOCKET = YesPlease |
|---|
| 42 | @@ -337,7 +325,7 @@ |
|---|
| 43 | ifdef CURLDIR |
|---|
| 44 | # This is still problematic -- gcc does not always want -R. |
|---|
| 45 | ALL_CFLAGS += -I$(CURLDIR)/include |
|---|
| 46 | - CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl |
|---|
| 47 | + CURL_LIBCURL = -L$(CURLDIR)/lib -lcurl |
|---|
| 48 | else |
|---|
| 49 | CURL_LIBCURL = -lcurl |
|---|
| 50 | endif |
|---|
| 51 | @@ -358,7 +346,7 @@ |
|---|
| 52 | ifdef OPENSSLDIR |
|---|
| 53 | # Again this may be problematic -- gcc does not always want -R. |
|---|
| 54 | ALL_CFLAGS += -I$(OPENSSLDIR)/include |
|---|
| 55 | - OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib |
|---|
| 56 | + OPENSSL_LINK = -L$(OPENSSLDIR)/lib |
|---|
| 57 | else |
|---|
| 58 | OPENSSL_LINK = |
|---|
| 59 | endif |
|---|
| 60 | @@ -376,7 +364,7 @@ |
|---|
| 61 | ifdef ICONVDIR |
|---|
| 62 | # Again this may be problematic -- gcc does not always want -R. |
|---|
| 63 | ALL_CFLAGS += -I$(ICONVDIR)/include |
|---|
| 64 | - ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib |
|---|
| 65 | + ICONV_LINK = -L$(ICONVDIR)/lib |
|---|
| 66 | else |
|---|
| 67 | ICONV_LINK = |
|---|
| 68 | endif |
|---|
