summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2014-12-03 12:01:05 +0000
committerJay Freeman <saurik@saurik.com>2014-12-03 12:01:05 +0000
commit41564b0496dc4efab215038a79df901f8797db06 (patch)
treef5b742baf8e2d4d2da41dca25df4a688ead25c88
parentafcc922dd2a82b7fe89a2e6364ccc56792b4a54d (diff)
Fix mistake in anti-hardlink patch.
git-svn-id: http://svn.telesphoreo.org/trunk@801 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--data/git/symlink.diff12
1 files changed, 10 insertions, 2 deletions
diff --git a/data/git/symlink.diff b/data/git/symlink.diff
index 4b10e71e4..87e4b5b47 100644
--- a/data/git/symlink.diff
+++ b/data/git/symlink.diff
@@ -1,6 +1,6 @@
diff -ru git-2.2.0/Makefile git-2.2.0+iPhone/Makefile
--- git-2.2.0/Makefile 2014-11-26 22:39:03.000000000 +0000
-+++ git-2.2.0+iPhone/Makefile 2014-12-03 08:21:03.000000000 +0000
++++ git-2.2.0+iPhone/Makefile 2014-12-03 11:56:31.000000000 +0000
@@ -1628,7 +1628,6 @@
$(BUILT_INS): git$X
@@ -17,7 +17,15 @@ diff -ru git-2.2.0/Makefile git-2.2.0+iPhone/Makefile
ln -s $< $@ 2>/dev/null || \
cp $< $@
-@@ -2226,14 +2224,12 @@
+@@ -2219,21 +2217,19 @@
+ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
+ $(RM) "$$execdir/$$p" && \
+ test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
++ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+ done; \
+ } && \
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
$(RM) "$$bindir/$$p" && \
test -z "$(NO_INSTALL_HARDLINKS)" && \