components/git/patches/perl_Makefile.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 28 Oct 2015 10:24:22 -0700
changeset 5021 c5e330e6831f
parent 4944 2efba29a3b65
permissions -rw-r--r--
Close of build 86.1.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4944
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     1
Make sure that the vendor pattern for installation is passed through to
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     2
MakeMaker.  This is not suitable for upstream.
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     3
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     4
--- git-2.4.5/perl/Makefile	Thu Jun 25 12:15:40 2015
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     5
+++ git-2.4.5/perl/Makefile	Sat Jul  4 11:32:21 2015
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     6
@@ -80,7 +80,7 @@
152
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     7
 	echo '	echo $(instdir_SQ)' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     8
 else
4944
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
     9
 $(makfile): Makefile.PL ../GIT-CFLAGS
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
    10
-	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)'
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
    11
+	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)' INSTALLDIRS=vendor
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
    12
 endif
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
    13
 
2efba29a3b65 20579345 git 2.6.1
Danek Duvall <danek.duvall@oracle.com>
parents: 731
diff changeset
    14
 # this is just added comfort for calling make directly in perl dir