|
Lines 1-4
Link Here
|
| 1 |
--- Makefile.orig 2023-11-20 02:07:41 UTC |
1 |
--- Makefile.orig 2024-02-23 00:37:50 UTC |
| 2 |
+++ Makefile |
2 |
+++ Makefile |
| 3 |
@@ -606,16 +606,16 @@ mandir = $(prefix)/share/man |
3 |
@@ -606,16 +606,16 @@ mandir = $(prefix)/share/man |
| 4 |
prefix = $(HOME) |
4 |
prefix = $(HOME) |
|
Lines 32-51
Link Here
|
| 32 |
XGETTEXT = xgettext |
32 |
XGETTEXT = xgettext |
| 33 |
MSGCAT = msgcat |
33 |
MSGCAT = msgcat |
| 34 |
MSGFMT = msgfmt |
34 |
MSGFMT = msgfmt |
| 35 |
@@ -1650,9 +1650,9 @@ ifndef NO_OPENSSL |
35 |
@@ -1665,9 +1665,9 @@ ifndef NO_OPENSSL |
| 36 |
|
36 |
|
| 37 |
ifndef NO_OPENSSL |
37 |
ifndef NO_OPENSSL |
| 38 |
OPENSSL_LIBSSL = -lssl |
38 |
OPENSSL_LIBSSL = -lssl |
| 39 |
- ifdef OPENSSLDIR |
39 |
- ifdef OPENSSLDIR |
| 40 |
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include |
40 |
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include |
| 41 |
- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) |
41 |
- OPENSSL_LINK = $(call libpath_template,$(OPENSSLDIR)/$(lib)) |
| 42 |
+ ifdef OPENSSLBASE |
42 |
+ ifdef OPENSSLBASE |
| 43 |
+ BASIC_CFLAGS += -I$(OPENSSLBASE)/include |
43 |
+ BASIC_CFLAGS += -I$(OPENSSLBASE)/include |
| 44 |
+ OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib) |
44 |
+ OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib) |
| 45 |
else |
45 |
else |
| 46 |
OPENSSL_LINK = |
46 |
OPENSSL_LINK = |
| 47 |
endif |
47 |
endif |
| 48 |
@@ -2559,7 +2559,7 @@ else # NO_PERL |
48 |
@@ -2574,7 +2574,7 @@ else # NO_PERL |
| 49 |
chmod +x $@+ && \ |
49 |
chmod +x $@+ && \ |
| 50 |
mv $@+ $@ |
50 |
mv $@+ $@ |
| 51 |
else # NO_PERL |
51 |
else # NO_PERL |
|
Lines 54-60
Link Here
|
| 54 |
$(QUIET_GEN) \ |
54 |
$(QUIET_GEN) \ |
| 55 |
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
55 |
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
| 56 |
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
56 |
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
| 57 |
@@ -2575,7 +2575,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py |
57 |
@@ -2590,7 +2590,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py |
| 58 |
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS |
58 |
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS |
| 59 |
$(SCRIPT_PYTHON_GEN): % : %.py |
59 |
$(SCRIPT_PYTHON_GEN): % : %.py |
| 60 |
$(QUIET_GEN) \ |
60 |
$(QUIET_GEN) \ |
|
Lines 63-69
Link Here
|
| 63 |
$< >$@+ && \ |
63 |
$< >$@+ && \ |
| 64 |
chmod +x $@+ && \ |
64 |
chmod +x $@+ && \ |
| 65 |
mv $@+ $@ |
65 |
mv $@+ $@ |
| 66 |
@@ -3451,7 +3451,7 @@ install: all |
66 |
@@ -3467,7 +3467,7 @@ install: all |
| 67 |
$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
67 |
$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
| 68 |
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
68 |
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
| 69 |
$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' |
69 |
$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' |