Merge pull request #1474 from pherl/fixscript

Fix cp -r usage to be portable.

objectivec/generate_well_known_types.sh

@@ -73,4 +73,4 @@ fi
 
 # Copy them over.
 echo "Copying over updated WellKnownType sources."
-cp -r "${TMP_DIR}/google/" "${ProtoRootDir}/objectivec/google/"
+cp -r "${TMP_DIR}/google/." "${ProtoRootDir}/objectivec/google/"