author | Ronald Jordan <ron.jordan@oracle.com> |
Fri, 09 May 2014 15:18:09 -0700 | |
branch | s11u1-sru |
changeset 3134 | 8c9dcb670552 |
parent 759 | 5bd27f9a56b8 |
child 1695 | 983495f058ad |
permissions | -rw-r--r-- |
759
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
--- cdrtools-3.00/DEFAULTS/Defaults.sunos5.orig Mon Apr 2 12:22:58 2012 |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
+++ cdrtools-3.00/DEFAULTS/Defaults.sunos5 Mon Apr 2 12:23:37 2012 |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
@@ -29,9 +29,9 @@ |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
CWARNOPTS= |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
|
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
DEFINCDIRS= $(SRCROOT)/include |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
-LDPATH= -L/opt/schily/lib |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
+LDPATH= |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
+RUNPATH= |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
|
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
########################################################################### |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
# |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
@@ -38,7 +38,7 @@ |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
# Installation config stuff |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
# |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
########################################################################### |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
-INS_BASE= /opt/schily |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
+INS_BASE= /usr |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
INS_KBASE= / |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
INS_RBASE= / |
5bd27f9a56b8
7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
# |