[llvm-branch-commits] [llvm-gcc-branch] r147200 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ build_gcc

[Bob Wilson]

Author: bwilson
Date: Thu Dec 22 17:18:24 2011
New Revision: 147200

URL: http://llvm.org/viewvc/llvm-project?rev=147200&view=rev
Log:
Merge svn r147173:
Don't hardcode the /Developer path when installing man pages. <rdar://10359031>

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/build_gcc

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 17:18:24 2011
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105535,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,128619,129022,129946,129957,135848
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105535,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,128619,129022,129946,129957,135848,147173

Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=147200&r1=147199&r2=147200&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Thu Dec 22 17:18:24 2011
@@ -638,7 +638,7 @@
 if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
 MAN1_DIR=${DEST_DIR}${ARM_PLATFORM}/Developer/usr/share/man/man1
 else
-MAN1_DIR=$DEST_DIR/Developer/usr/share/man/man1
+MAN1_DIR=$DEST_DIR$DEST_ROOT/../share/man/man1
 fi
 mkdir -p ${MAN1_DIR}
 for i in gcc.1 g++.1 cpp.1 gcov.1 ; do