components/git/patches/python_Makefile.patch
author Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
Mon, 18 Feb 2013 01:17:35 -0600
branchs11u1-sru
changeset 2497 43014bd244d4
parent 586 7e532871fc48
permissions -rw-r--r--
15765108 SUNBT7128313 ksh93 executes subshell with bad path to command
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
586
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
--- git-1.7.3.2/git_remote_helpers/Makefile.orig	Tue Nov 15 05:25:37 2011
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
+++ git-1.7.3.2/git_remote_helpers/Makefile	Tue Nov 15 06:35:06 2011
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
@@ -23,13 +23,15 @@
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
 
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
 PYLIBDIR=$(shell $(PYTHON_PATH) -c \
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
 	 "import sys; \
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
-	 print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
+	 print 'lib/python%i.%i/vendor-packages' % sys.version_info[:2]")
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
 
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
 all: $(pysetupfile)
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
 	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
 
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
 install: $(pysetupfile)
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
-	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
+	$(PYTHON_PATH) $(pysetupfile) install \
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
+	--install-lib=$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR) \
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+	--prefix $(DESTDIR_SQ)$(prefix)
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 instlibdir: $(pysetupfile)
7e532871fc48 7046977 git delivers python bits to site-packages
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
 	@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"