author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
Wed, 13 Apr 2011 09:58:06 -0700 | |
changeset 181 | 87e11e685b1f |
parent 152 | f0ba422362c2 |
child 731 | 2a19ec4c0d8f |
permissions | -rw-r--r-- |
152
f0ba422362c2
7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff
changeset
|
1 |
--- git-1.7.3.2/perl/Makefile_orig Thu Oct 21 20:49:16 2010 |
f0ba422362c2
7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ git-1.7.3.2/perl/Makefile Tue Mar 22 09:43:32 2011 |
f0ba422362c2
7030869 move git from sfw consolidation to userland consolidation
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -20,20 +20,18 @@ |
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 |