Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 12832) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 12833) @@ -16,13 +16,10 @@ mv Python-2.7.2/* src rm -rf Python-2.7.2 -#Configure doxygen +#Configure and compile cd src ./configure \ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" - - -#make if [ -z $1 ]; then make else @@ -31,19 +28,15 @@ make install cd ../install + +#get rid of bin, because it's just a copy of +#Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect +#new changes being made +rm -rf bin ln -s Library/Frameworks/Python.framework/Headers include ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib +ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin -#Some modifications to be done in case version is 2.7 -if [[ $version == "2.7.2" ]]; then - cd ../install - #get rid of bin, because it's just a copy of Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect new changes being made - rm -rf bin - ln -s Library/Frameworks/Python.framework/Headers include - ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib - ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin - - #Patch pyport.h: - cd include - patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch -fi +#Patch pyport.h: +cd include +patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch