Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/git/patches/perl_Makefile.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Tue, 13 Mar 2012 10:07:00 -0700
changeset 731 2a19ec4c0d8f
parent 152 f0ba422362c2
child 4944 2efba29a3b65
permissions -rw-r--r--
7152417 upgrade git to version 1.7.9.2 7008422 Problem with utility/git
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
731
2a19ec4c0d8f 7152417 upgrade git to version 1.7.9.2
Craig Mohrman <craig.mohrman@oracle.com>
parents: 152
diff changeset 
     1
 
--- git-1.7.9.2/perl/Makefile.~1~	Wed Feb 22 18:04:18 2012
2a19ec4c0d8f 7152417 upgrade git to version 1.7.9.2
Craig Mohrman <craig.mohrman@oracle.com>
parents: 152
diff changeset 
     2
 
+++ git-1.7.9.2/perl/Makefile	Fri Mar  2 14:51:25 2012
2a19ec4c0d8f 7152417 upgrade git to version 1.7.9.2
Craig Mohrman <craig.mohrman@oracle.com>
parents: 152
diff changeset 
     3
 
@@ -21,20 +21,18 @@
152
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     4
 
 	$(RM) $(makfile).old
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     5
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     6
 
 ifdef NO_PERL_MAKEMAKER
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     7
 
-instdir_SQ = $(subst ','\'',$(prefix)/lib)
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     8
 
+instdir_SQ = $(subst ','\'',$$(PERL_LIB))
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
     9
 
 $(makfile): ../GIT-CFLAGS Makefile
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    10
 
 	echo all: private-Error.pm Git.pm > $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    11
 
 	echo '	mkdir -p blib/lib' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    12
 
 	echo '	$(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    13
 
 	echo '	$(RM) blib/lib/Error.pm' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    14
 
-	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    15
 
 	echo '	cp private-Error.pm blib/lib/Error.pm' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    16
 
 	echo install: >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    17
 
-	echo '	mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    18
 
-	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    19
 
-	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    20
 
-	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    21
 
-	echo '	cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    22
 
+	echo '	mkdir -p "$$(DESTDIR)/$(instdir_SQ)"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    23
 
+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)/$(instdir_SQ)"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    24
 
+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    25
 
+	echo '	cp private-Error.pm "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    26
 
 	echo instlibdir: >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    27
 
 	echo '	echo $(instdir_SQ)' >> $@
f0ba422362c2 7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset 
    28
 
 else
upstream/oracle/userland-gate