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/lcms/patches/004-ltmain.sh.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 24 Feb 2012 13:30:24 -0800
changeset 706 6e61f0012046
parent 174 187aa0541610
permissions -rw-r--r--
7108059 Userland should have python2.7 version of its python modules
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- ltmain.sh	2006-10-16 22:22:11.000000000 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ ltmain.sh	2011-03-30 09:04:38.929871299 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -5972,17 +5972,6 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 	  # Determine the prefix the user has applied to our future dir.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-	  # Don't allow the user to place us outside of our expected
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
-	  # location b/c this prevents finding dependent libraries that
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
-	  # are installed to the same prefix.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
-	  # At present, this check doesn't affect windows .dll's that
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
-	  # are installed into $libdir/../bin (currently, that works fine)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
-	  # but it's something to keep an eye on.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
-	  if test "$inst_prefix_dir" = "$destdir"; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
-	    exit $EXIT_FAILURE
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
-	  fi
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
-
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
 	  if test -n "$inst_prefix_dir"; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 	    # Stick the inst_prefix_dir data into the link command.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
 	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
upstream/oracle/userland-gate