diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-23 21:41:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-23 21:41:25 +0200 |
| commit | 2b198ddc02b3231e43ab8fdddef76ff103a0f5a4 (patch) | |
| tree | 02cda54987930d677beb7ad60b5bf52cb9d67da9 /package/git/patches | |
| parent | 54893039866e0978bd6563e2b7361f7736341163 (diff) | |
make allmodconfig work for alix1c eglibc
many upstream package updates,
squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git
Diffstat (limited to 'package/git/patches')
| -rw-r--r-- | package/git/patches/patch-Makefile | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index 46b1488e5..c0e2e28ce 100644 --- a/package/git/patches/patch-Makefile +++ b/package/git/patches/patch-Makefile @@ -1,16 +1,6 @@ -use symlinks instead of hardlinks ---- git-1.6.3.3.orig/Makefile 2009-06-22 08:24:25.000000000 +0200 -+++ git-1.6.3.3/Makefile 2009-07-24 20:59:26.186421458 +0200 -@@ -215,7 +215,7 @@ bindir_relative = bin - bindir = $(prefix)/$(bindir_relative) - mandir = share/man - infodir = share/info --gitexecdir = libexec/git-core -+gitexecdir = bin - sharedir = $(prefix)/share - template_dir = share/git-core/templates - htmldir = share/doc/git-doc -@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm +--- git-1.6.4.1.orig/Makefile 2009-08-22 06:54:01.000000000 +0200 ++++ git-1.6.4.1/Makefile 2009-08-23 12:11:07.755226105 +0200 +@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ @@ -18,15 +8,17 @@ use symlinks instead of hardlinks ln -s git$X $@ 2>/dev/null || \ cp git$X $@ -@@ -1554,11 +1553,9 @@ endif - execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ - { $(RM) "$$execdir/git-add$X" && \ +@@ -1663,11 +1662,11 @@ endif + { test "$$bindir/" = "$$execdir/" || \ + { $(RM) "$$execdir/git$X" && \ test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ -- ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \ - cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \ - { for p in $(filter-out git-add$X,$(BUILT_INS)); do \ +- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ ++ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ + cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ + { for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ -- ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \ +- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ done; } && \ |